入库接口处理

src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -83,6 +83,7 @@ public class MESServiceImpl implements MESService {
         String vendName="";
         int piid = 0;
         String piCode="";
+        String mCode="";
         List<String> sqls = new ArrayList<>();
         for (int i = 0; i <jsonArray.size() ; i++) {
             JSONObject jsonObject = JSON.parseObject(StringUtil.nvl(jsonArray.get(i), ""));
@@ -91,7 +92,7 @@ public class MESServiceImpl implements MESService {
             inType = StringUtil.nvl(jsonObject.get("inType"), "");
             vendNo = StringUtil.nvl(jsonObject.get("vendNo"), "");
             vendName = StringUtil.nvl(jsonObject.get("vendName"), "");
-            piCode = StringUtil.nvl(jsonObject.get("piCode"), "");
+            mCode = StringUtil.nvl(jsonObject.get("piCode"), "");
             if ("自购".equals(inType)) {
                 if ("".equals(mesCode)) {
                     return ApiResponse.failRsp("10011", requestId, "ERP单据编号不能为空！");
@@ -191,13 +192,14 @@ public class MESServiceImpl implements MESService {
             // 转入明细
             transferRepository.transferDetail(caller, vaid, key, employee);
         }else{
-            if ("".equals(piCode)){
+            /*if ("".equals(piCode)){
                 piCode=baseDao.sGetMaxNumber(djcaller,2);
             }else {
                 if (baseDao.checkIf("prodinout" ,"pi_inoutno='" + piCode + "'")){
                     return ApiResponse.failRsp("10019", requestId, "入库单号[" + piCode + "]已存在，请确认！");
                 }
-            }
+            }*/
+            piCode=baseDao.sGetMaxNumber(djcaller,2);
             piid= baseDao.getSeqId("ProdInOut_seq");
             // 供应商名称以 ERP 档案为准，避免 MES 与 ERP 名称不一致
             if (!"".equals(vendNo)) {
@@ -208,10 +210,10 @@ public class MESServiceImpl implements MESService {
             }
             sqls.add("insert into prodinout(pi_id,pi_inoutno,pi_class,pi_date,pi_type,pi_cardcode,pi_title,"
                     + "pi_status,pi_statuscode,pi_invostatus,pi_invostatuscode,pi_whcode,pi_whname,pi_departmentcode,pi_departmentname,"
-                    + "pi_recordman,pi_recorddate,pi_updateman,pi_updatedate,pi_total,pi_mescode) "
+                    + "pi_recordman,pi_recorddate,pi_updateman,pi_updatedate,pi_total,pi_mescode,pi_mcode) "
                     + "values(" + piid + ",'" + piCode + "','" + type + "',sysdate,'客供料入库','" + vendNo + "','" + vendName + "',"
                     + "'未过账','UNPOST','已审核','AUDITED','" + warehouses[0] + "','" + warehouses[1] + "','B19','仓储部',"
-                    + "'" + employee.getEm_name() + "',sysdate,'" + employee.getEm_name() + "',sysdate,0,'" + piCode + "')");
+                    + "'" + employee.getEm_name() + "',sysdate,'" + employee.getEm_name() + "',sysdate,0,'" + mesCode + "','"+mCode+"')");
             // 补明细：原逻辑只 add 了主表 SQL，明细从未写入，导致后续 delete/update 落空、也无法过账
             if (array == null || array.size() < 1) {
                 return ApiResponse.failRsp("10021", requestId, "入库明细不能为空！");