Browse Source

MES生成的其它出库单默认在录入状态

koul 1 year ago
parent
commit
82b353cccf

+ 0 - 10
src/main/java/com/uas/eis/controller/ERPController.java

@@ -110,14 +110,4 @@ public class ERPController {
         return erpService.syncMakeScrap(data);
     }
 
-    /**
-     * 生产报废单反审核MES校验
-     * @param data
-     * @return
-     */
-    @RequestMapping("/erp/resAuditMakeScrapCheck")
-    public Map<String, Object> resAuditMakeScrapCheck(String data){
-        return erpService.resAuditMakeScrapCheck(data);
-    }
-
 }

+ 1 - 1
src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -667,7 +667,7 @@ public class MESServiceImpl implements MESService {
             id = baseDao.getSeqId("PRODINOUT_SEQ");
             code = baseDao.sGetMaxNumber(caller, 2);
             sqls.add("insert into prodinout (pi_id,pi_inoutno,pi_class,pi_date,pi_statuscode,pi_status,pi_departmentcode,pi_departmentname,pi_emcode,pi_emname,pi_invostatuscode,pi_invostatus,pi_recordman,pi_recorddate,pi_printstatuscode,pi_printstatus,pi_type,pi_mescode,pi_cardcode,pi_title,pi_custno) " +
-                    "values ("+id+",'"+code+"','"+piclass+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy-MM-dd HH24:mi:ss'),'UNPOST','未过账','"+map1.get("FNumber")+"','"+map1.get("FName")+"','"+map3.get("FNumber")+"','"+map3.get("FName")+"','AUDITED','已审核','"+map5.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy-MM-dd HH24:mi:ss'),'UNPRINT','未打印','"+map2.get("FName")+"','"+fSelBillNo+"','"+fCustCode+"','"+cuname+"','"+fCustNo+"')");
+                    "values ("+id+",'"+code+"','"+piclass+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy-MM-dd HH24:mi:ss'),'UNPOST','未过账','"+map1.get("FNumber")+"','"+map1.get("FName")+"','"+map3.get("FNumber")+"','"+map3.get("FName")+"','ENTERING','在录入','"+map5.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy-MM-dd HH24:mi:ss'),'UNPRINT','未打印','"+map2.get("FName")+"','"+fSelBillNo+"','"+fCustCode+"','"+cuname+"','"+fCustNo+"')");
         }
         JSONArray array = data.get("detail");
         int detno=1;