wms修改2

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

@@ -615,7 +615,10 @@ public class SapItemSyncImpl implements SapItemSyncService {
             }
             log.info("来料暂收参数-------" + mapList.toString());
             JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM");
+//            String P_LFSNR = func.getTableParameterList().getString("P_LFSNR");
             System.out.println(L_ITEM);
+            String P_LFSNR = (String) mapList.get(0).get("P_LFSNR");
+            func.getTableParameterList().setValue("P_LFSNR", P_LFSNR);
             for (Map map : mapList) {
                 L_ITEM.appendRow();
                 L_ITEM.setValue("EBELN", map.get("EBELN"));

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+import static com.op.common.core.web.domain.AjaxResult.error;
 import static com.op.common.core.web.domain.AjaxResult.success;
 /*
 可以写手持，wms/WmsToWCSmission开放了
@@ -250,6 +251,9 @@ public class WmsToWCSmissionController {
     @PostMapping("/SweepMaterialCardSC")
     public AjaxResult SweepMaterialCardSC(@RequestBody WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) {
         WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1 = odsProcureOrderService.SweepMaterialCardSC(wmsOdsMateStorageNewsSn);
+        if (wmsOdsMateStorageNewsSn1.getUserDefined3().equals("0")){//userDefined3
+            return error("未105过账");
+        }
         return success(wmsOdsMateStorageNewsSn1);
     }
 

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

@@ -779,6 +779,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         paramMap.put("MATNR",order.getMaterialCode());
         paramMap.put("WERKS",order.getSiteCode());
         paramMap.put("QUANTITY",amount.toString());
+        paramMap.put("P_KFSNR",order.getUserDefined5());
         mapList.add(paramMap);
         R result2 =   remoteSapService.temporarilyCollected(mapList);
         int code = result2.getCode();
@@ -1586,7 +1587,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     @Override
     public WmsOdsMateStorageNewsSn SweepMaterialCardSC(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) {
         DynamicDataSourceContextHolder.push("ds_" + wmsOdsMateStorageNewsSn.getFactoryCode());
-        wmsOdsMateStorageNewsSn.setUserDefined3("1");//1是入库
+       // wmsOdsMateStorageNewsSn.setUserDefined3("1");//1是入库
        WmsOdsMateStorageNewsSn   wmsOdsMateStorageNewsSnk=    wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnByWlCodeTEM(wmsOdsMateStorageNewsSn);
         return wmsOdsMateStorageNewsSnk;
     }