装配问题 订单数量/单位标准出货数量

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 王总要求添加
 }

src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java

@@ -97,9 +97,9 @@ public class PackingServiceImpl implements PackingService {
         // 保存记录
         List<PackingVo> result = new ArrayList<>();
         // 交货记录表 不存在 该交货记录 生成交货记录
-        // 草稿单
+        // 草稿单 查询sap视图的view_picking_out
         List<PackingVo> packingList = packingDao.getPackingList(packingVo);
-        // 记录
+        // 记录 查询picking_info
         List<PackingVo> pickInfoList = packingDao.getPickingInfoList(packingVo);
         // 删除的记录
         List<PackingVo> 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("<Document_Lines>");
         for (PickingInfo info : packingVos) {
             log.info("数量:{}", info.getOrderQty());
+            int unitNums = (int) (info.getPickedQty()/ info.getUnitSalesQty());
             xmlParams.append("<row>")
                     .append("<BaseType>17</BaseType>")
                     .append("<BaseEntry>" + info.getShopOrderNo() + "</BaseEntry>")
                     .append("<BaseLine>" + info.getShopOrderLine() + "</BaseLine>")
-                    .append("<Quantity>" + info.getPickedQty() + "</Quantity>")
+                    //.append("<Quantity>" + info.getPickedQty() + "</Quantity>")
+                    .append("<Quantity>" + unitNums + "</Quantity>")
                     .append("<WarehouseCode>01</WarehouseCode>");
             xmlParams.append("</row>");
         }

src/main/java/com/gaotao/modules/finishedProduct/vo/PackingVo.java

@@ -33,4 +33,6 @@ public class PackingVo {
 
     private List<CRollinfoEntity> rollList;
 
+    private Double unitSalesQty;//标准单位出货数量 2023-04-07 王总要求添加
+
 }

src/main/resources/mapper/finishedProduct/PackingDao.xml

@@ -27,7 +27,7 @@
     </select>
 
     <select id="getPackingList" resultType="com.gaotao.modules.finishedProduct.vo.PackingVo">
-        SELECT order_no, line, order_qty, part_no, customer_id , shop_order_no , shop_order_line
+        SELECT order_no, line, order_qty, part_no, customer_id , shop_order_no , shop_order_line, unit_sales_qty
         FROM VIEW_PACKING_OUT
         <where>
             order_no = #{orderNo}
@@ -69,7 +69,7 @@
         where 物料编码 = #{partNo}
     </select>
     <select id="getPickingInfoList" resultType="com.gaotao.modules.finishedProduct.vo.PackingVo">
-        select order_no, order_line as line, order_qty
+        select order_no, order_line as line, order_qty, unit_sales_qty
         from picking_info
         where order_no = #{orderNo}
     </select>
@@ -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}
     </select>