Browse Source

供应商

dongke 1 year ago
parent
commit
e88a8c225d

+ 7 - 5
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -227,11 +227,13 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //销售出库新建
             if (itemList!=null && itemList.size() > 0) {
                 for (OutboundItemVO outboundItemVO : itemList) {
-                    //箱
-                    outboundItemVO.setOutBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(),RoundingMode.DOWN).toString()) );
-                    //片
-                    outboundItemVO.setOutPiece(outboundItemVO.getOutingQty().remainder(outboundItemVO.getPackBox()));
-                }
+                    if(outboundItemVO.getSkuId()!=null){ //过滤外协品 外协品没有箱片
+                        //箱
+                        outboundItemVO.setOutBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(),RoundingMode.DOWN).toString()) );
+                        //片
+                        outboundItemVO.setOutPiece(outboundItemVO.getOutingQty().remainder(outboundItemVO.getPackBox()));
+                    }
+                 }
                 outboundVO.setFlgAutoHandle(true);
                 outboundVO.setItemList(itemList);
                 this.saleOrderOutboundInsert(outboundVO, true);

+ 1 - 1
src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -258,7 +258,7 @@ public class OrderService extends BaseService<Order> {
         orderVO.setOrderId(codeMap.get("outId").toString()).setOrderNo(codeMap.get("outNote").toString())
                 .setOrderType(Constant.DocumentType.ORDER.getName());
         // 转化实体
-        Order order = orderConvert.convertToPo(orderVO);
+         Order order = orderConvert.convertToPo(orderVO);
         // 订单总单保存
         super.insert(order);