ERP_override.git

			@@ -157,7 +157,6 @@
			customer.value = produceList.value[0].detail[0]
			let height = 0
			let index = 0
			console.log(res.data.data)
			for(let i=0;i<produceList.value.length;i++){
			//换产品就换页
			if(i>0){
			@@ -222,7 +221,6 @@
			type:'sum',
			sum:sum
			})
			console.log(page)

			})
			} else {

			@@ -1183,12 +1183,14 @@
			}

			Map<String, Object> itemmap = new HashMap<>();
			itemmap.put("detail",finishedGoodsInventoryMapper.getPrintTitleByBox(
			List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox(
			finishedGoodsInventory.getOrder().getCustomerId(),
			finishedGoodsInventory.getOrder().getProject(),
			boxNo,
			orderId
			) );
			);

			itemmap.put("detail",detail);
			//获取库存里面此订单此箱号的所有产品信息
			List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
			.getorderProductByBoxNo(orderId,boxNo);
			@@ -1198,13 +1200,6 @@
			for(Map<String, Object> details:detailList){
			Map<String, Object> detailsmap = new HashMap<>();
			detailsmap.put("product_name",details.get("product_name").toString());
			/*finishedOperateLogMapper
			.getDetailLists(
			finishedOperateLog.getOrderId(),
			finishedOperateLog.getRemarks(),
			Integer.valueOf(details.get("product_id").toString()),
			details.get("thickness").toString()
			);*/
			//获取明细数据
			List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper
			.getPrintDetail(

			@@ -1074,11 +1074,11 @@
			<select id="getPrintTitleByBox">
			select kkk.*,
			rw.teams_groups_name as teams_groups_name2
			from(select o.order_id,
			from(select #{orderId} as order_id,
			o.customer_name,
			o.customer_id,
			o.project,
			(select p.batch from sd.`order` p where p.order_id =#{orderId}) as batch,
			(select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,
			fol.box_no as 'remarks',
			SUM(fol.quantity_available) as quantity,
			ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史