采购入库接口调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataVO.java

@@ -36,7 +36,7 @@ public class SyOrderDataVO {
     //采购委外账套号
     private java.lang.String ompoAccount;
     //门幅
-    private java.math.BigDecimal guangpeiGateWidth;
+    private String guangpeiGateWidth;
     //克重
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -107,7 +107,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
 
                 if(cCode!=null){
                     map.put("cCode",cCode);
-//                    this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(map.get("cCode"))),"24");
+                    this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(map.get("cCode"))),"24");
                 }else{
                     throw new RuntimeException("获取入库单号失败");
                 }
@@ -437,7 +437,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                     saveItemJson.put("IPROCESSCOST",m.get("iOriCost"));
                     saveItemJson.put("INQUANTITY",m.get("INQUANTITY"));
                     //获取自定义项 自由项 批次项
-                    getCDEFINEJson(saveItemJson,m);
+                    getCDEFINEJson(saveItemJson,m,"1");
                     itemJsonArray.add(saveItemJson);
                 }
                 saveJson.put("DETAILList",itemJsonArray);
@@ -449,12 +449,17 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
 
     }
 
-    public void getCDEFINEJson(JSONObject saveItemJson,Map<String,Object> m){
+    //type为1：入库单，为2：调拨单，为3：材料出库单
+    public void getCDEFINEJson(JSONObject saveItemJson,Map<String,Object> m,String type){
         saveItemJson.put("CDEFINE22",m.get("cDefine22"));
         saveItemJson.put("CDEFINE23",m.get("cDefine23"));
         saveItemJson.put("CDEFINE24",m.get("cDefine24"));
         saveItemJson.put("CDEFINE25",m.get("cDefine25"));
-        saveItemJson.put("CDEFINE26",m.get("cDefine26"));
+        if(type.equals("1")){
+            saveItemJson.put("CDEFINE26",null);
+        }else{
+            saveItemJson.put("CDEFINE26",m.get("cDefine26"));
+        }
         saveItemJson.put("CDEFINE27",m.get("cDefine27"));
         saveItemJson.put("CDEFINE28",m.get("cDefine28"));
         saveItemJson.put("CDEFINE29",m.get("cDefine29"));
@@ -888,7 +893,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                     saveItemJson.put("AUTOID_PO",m.get("iomids"));
                     saveItemJson.put("POAUTOIDCOL","MOMaterialsID");
                     //获取自定义项 自由项 批次项
-                    getCDEFINEJson(saveItemJson,m);
+                    getCDEFINEJson(saveItemJson,m,"2");
                     itemJsonArray.add(saveItemJson);
                 }
                 saveJson.put("DETAILList",itemJsonArray);
@@ -1139,7 +1144,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                         saveItemJson.put("AUTOID_ALL",m.get("AUTOID_ALL"));
                         saveItemJson.put("ALLCAUTOIDCOL",m.get("ALLCAUTOIDCOL"));
                         //获取自定义项 自由项 批次项
-                        getCDEFINEJson(saveItemJson,m);
+                        getCDEFINEJson(saveItemJson,m,"3");
                         itemJsonArray.add(saveItemJson);
                     }
                     saveJson.put("DETAILList",itemJsonArray);