wms过账加过账批次

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java

@@ -245,6 +245,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 L_ITEM.setValue("MATNR", stringObjectMap.get("MATNR"));
                 L_ITEM.setValue("QUANTITY", stringObjectMap.get("QUANTITY"));
                 L_ITEM.setValue("MEINS", stringObjectMap.get("MEINS"));
+                L_ITEM.setValue("CHARG", stringObjectMap.get("CHARG"));
             }
             func.execute(dest);//执行调用函数
             System.out.println(func.getExportParameterList());

op-modules/op-wms/src/main/java/com/op/wms/domain/OrderLine.java

@@ -42,6 +42,15 @@ public class OrderLine extends BaseEntity {
     private String unit;
     private String userDefined2;
     private String userDefined3;
+    private String userDefined4;
+
+    public String getUserDefined4() {
+        return userDefined4;
+    }
+
+    public void setUserDefined4(String userDefined4) {
+        this.userDefined4 = userDefined4;
+    }
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd")

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java

@@ -231,11 +231,19 @@ public class WmsSellOutEmbryo extends BaseEntity {
     @Excel(name = "有效标记")
     private String activeFlag;
     private   List<WmsProductPutTrayCode> wmsProductPutTrayCodeList;
-
+    private   List<WmsFpStorageNewsSn> wmsFpStorageNewsSns;
     public List<WmsProductPutTrayCode> getWmsProductPutTrayCodeList() {
         return wmsProductPutTrayCodeList;
     }
 
+    public List<WmsFpStorageNewsSn> getWmsFpStorageNewsSns() {
+        return wmsFpStorageNewsSns;
+    }
+
+    public void setWmsFpStorageNewsSns(List<WmsFpStorageNewsSn> wmsFpStorageNewsSns) {
+        this.wmsFpStorageNewsSns = wmsFpStorageNewsSns;
+    }
+
     public void setWmsProductPutTrayCodeList(List<WmsProductPutTrayCode> wmsProductPutTrayCodeList) {
         this.wmsProductPutTrayCodeList = wmsProductPutTrayCodeList;
     }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -351,6 +351,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 odsProcureOutOrder.setPlanNumber(orderLine1.getQty());
                 odsProcureOutOrder.setUserDefined2(orderLine1.getOrderLineNo());
                 odsProcureOutOrder.setUserDefined3(orderLine1.getUserDefined3());
+                odsProcureOutOrder.setUserDefined4(orderLine1.getUserDefined4());
                 odsProcureOutOrder.setUserDefined10("1");
                 odsProcureOutOrder.setCreateBy(SecurityUtils.getUsername());
                 odsProcureOutOrder.setCreateDate(new Date());
@@ -376,6 +377,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     odsProcureOutOrder.setActive("1");
                     odsProcureOutOrder.setOrderStatus("1");
                     odsProcureOutOrder.setUserDefined10("1");
+                    odsProcureOutOrder.setUserDefined4(orderLine1.getUserDefined4());
                     odsProcureOutOrder.setPlanNumber(orderLine1.getQty());
                     odsProcureOutOrder.setUserDefined2(orderLine1.getOrderLineNo());
                     //odsProcureOutOrder.set
@@ -614,6 +616,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 map.put("MATNR", odsProcureOutOrder.getMaterialCode());
                 map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString());
                 map.put("MEINS", odsProcureOutOrder.getUnit());
+                map.put("CHARG", odsProcureOutOrder.getUserDefined4());
                 mapList.add(map);
                 orderList2.add(odsProcureOutOrder);
             }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -835,6 +835,33 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         String  result1="出库成功";
         DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode());
         List<WmsProductPutTrayCode> wmsProductPutTrayCodeList=    wmsSellOutEmbryo.getWmsProductPutTrayCodeList();
+        List<WmsFpStorageNewsSn>  wmsFpStorageNewsSns  =   wmsSellOutEmbryo.getWmsFpStorageNewsSns();
+        for (WmsFpStorageNewsSn  wmsFpStorageNewsSn:
+                wmsFpStorageNewsSns) {
+            WmsSellOutEmbryo    wmsSellOutEmbryo1 =   wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId());
+            BigDecimal OutQuantity=   wmsSellOutEmbryo1.getOutQuantity().add(wmsFpStorageNewsSn.getAmount());//已出加操作
+            int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity);
+            WmsSellOutEmbryo    wmsSellOutEmbryoUpdate=new  WmsSellOutEmbryo();
+            if (result == 0){//出库完
+                wmsSellOutEmbryoUpdate.setStatus("2");
+            }else {
+                wmsSellOutEmbryoUpdate.setStatus("1");
+            }
+            wmsSellOutEmbryoUpdate.setId(wmsSellOutEmbryo.getId());
+            wmsSellOutEmbryoUpdate.setOutQuantity(OutQuantity);
+            wmsSellOutEmbryoMapper.updateWmsSellOutEmbryo(wmsSellOutEmbryoUpdate);
+            WmsFpStorageNewsSn  wmsFpStorageNewsSn1=new WmsFpStorageNewsSn();
+            wmsFpStorageNewsSn1.setStorageId(wmsFpStorageNewsSn.getStorageId());
+            wmsFpStorageNewsSn1.setUserDefined2(wmsFpStorageNewsSn.getAmount().toString());
+            wmsFpStorageNewsSn1.setActiveFlag("1");
+            wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode());
+            wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1);
+        }
+
+
+
+
+
         //成品销售出库--确认接口---修改出库单，--出库库存
         WmsSellOutEmbryo    wmsSellOutEmbryo1 =   wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId());
         Integer tem=   wmsProductPutTrayCodeList.size();
@@ -862,7 +889,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn.setProductCode(wmsSellOutEmbryo1.getProductCode());
             wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn);
             //判断如果托盘数据被出完，就关闭这个明细
-            List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=  wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
+//            List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=  wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
             if (wmsFpStorageNewsSns.size()>0){
                 WmsFpStorageNewsSn  wmsFpStorageNewsSn1=    wmsFpStorageNewsSns.get(0);
 

op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml

@@ -313,8 +313,8 @@
     </delete>
     <update id="updateWmsFpStorageNewsSnOut">
         update wms_fp_storage_news_sn
-        set user_defined2 = COALESCE(user_defined2, 0) + 1
-        where sn=#{sn}  and active_flag='1'
+        set user_defined2 = #{userDefined2} + 1
+        where storage_id=#{storageId}  and active_flag='1'
     </update>
     <select id="selectwmsFpStorageNews"     resultType="java.lang.String">
         select  DISTINCT user_defined1 from  wms_fp_storage_news  where   product_code=#{productCode} and active_flag='1'