diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java index 22d097b..5bc354b 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java @@ -398,8 +398,13 @@ public class PackingServiceImpl implements PackingService { // boxLabelPrint.setCustomer(partVo.getCustomerId()); // 客户 // } // log.info("注入的数据:{}", boxLabelPrint); - - + PickingInfo query = new PickingInfo(); + query.setOrderStatus("N"); + query.setOrderNo(Long.valueOf(reportFileVo.getOrderNo())); + query.setPartNo(reportFileVo.getPartNo()); + List pickingInfos = packingInfoService.getPickingList(query); + PickingInfo pickingInfo = pickingInfos.get(0); + double unitSalesQty = pickingInfo.getUnitSalesQty(); // 根据箱码获取 生产单号 String boxNo = reportFileVo.getBoxNo(); // String lotNo = soReceiveBoxesService.getLotNo(boxNo); @@ -422,6 +427,7 @@ public class PackingServiceImpl implements PackingService { String serialNo = RandomUtil.getOrderNoByAtomic1("Box"); // 装箱数量 Double pickingNumber = reportFileVo.getPickingNumber(); + pickingNumber = pickingNumber/unitSalesQty;//2023-04-17 修改获取的数量 // 获取插入数据表的列 List cloumns = boxLabelPrintDao.getCloumns("box_label_print"); // 获取打印数据