diff --git a/src/main/java/com/gaotao/modules/finishedProduct/entity/PickingInfo.java b/src/main/java/com/gaotao/modules/finishedProduct/entity/PickingInfo.java index 5523a1e..1429fb9 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/entity/PickingInfo.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/entity/PickingInfo.java @@ -24,4 +24,5 @@ public class PickingInfo { private Long shopOrderNo; private Long shopOrderLine; private Double pickeQty; + private Double unitSalesQty;//标准单位出货数量 2023-04-07 王总要求添加 } 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 e52e268..22d097b 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 @@ -97,9 +97,9 @@ public class PackingServiceImpl implements PackingService { // 保存记录 List result = new ArrayList<>(); // 交货记录表 不存在 该交货记录 生成交货记录 - // 草稿单 + // 草稿单 查询sap视图的view_picking_out List packingList = packingDao.getPackingList(packingVo); - // 记录 + // 记录 查询picking_info List pickInfoList = packingDao.getPickingInfoList(packingVo); // 删除的记录 List difPacking = new ArrayList<>(); @@ -135,6 +135,7 @@ public class PackingServiceImpl implements PackingService { pickingInfo.setCreatedBy(user.getUserDisplay()); pickingInfo.setShopOrderLine(item.getShopOrderLine()); pickingInfo.setShopOrderNo(item.getShopOrderNo()); + pickingInfo.setUnitSalesQty(item.getUnitSalesQty()); return pickingInfo; }).collect(Collectors.toList()); packingInfoService.saveBatch(addInfoList); @@ -151,6 +152,7 @@ public class PackingServiceImpl implements PackingService { pickingInfo.setCreatedBy(user.getUserDisplay()); pickingInfo.setShopOrderLine(item.getShopOrderLine()); pickingInfo.setShopOrderNo(item.getShopOrderNo()); + pickingInfo.setUnitSalesQty(item.getUnitSalesQty()); return pickingInfo; }).collect(Collectors.toList()); packingInfoService.saveBatch(pickingInfoList); @@ -317,11 +319,13 @@ public class PackingServiceImpl implements PackingService { .append(""); for (PickingInfo info : packingVos) { log.info("数量:{}", info.getOrderQty()); + int unitNums = (int) (info.getPickedQty()/ info.getUnitSalesQty()); xmlParams.append("") .append("17") .append("" + info.getShopOrderNo() + "") .append("" + info.getShopOrderLine() + "") - .append("" + info.getPickedQty() + "") + //.append("" + info.getPickedQty() + "") + .append("" + unitNums + "") .append("01"); xmlParams.append(""); } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/vo/PackingVo.java b/src/main/java/com/gaotao/modules/finishedProduct/vo/PackingVo.java index b9e13e4..e2863e2 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/vo/PackingVo.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/vo/PackingVo.java @@ -33,4 +33,6 @@ public class PackingVo { private List rollList; + private Double unitSalesQty;//标准单位出货数量 2023-04-07 王总要求添加 + } diff --git a/src/main/resources/mapper/finishedProduct/PackingDao.xml b/src/main/resources/mapper/finishedProduct/PackingDao.xml index b11ddba..76f7123 100644 --- a/src/main/resources/mapper/finishedProduct/PackingDao.xml +++ b/src/main/resources/mapper/finishedProduct/PackingDao.xml @@ -27,7 +27,7 @@ @@ -84,7 +84,8 @@ created_by, shop_order_no, shop_order_line, - picke_qty + picke_qty, + unit_sales_qty from picking_info where order_no = #{orderNo}