修改客户及仓库对应关系

src/main/java/com/uas/eis/entity/Product.java

@@ -25,7 +25,7 @@ public class Product implements Serializable {
     @JSONField(name = "companyNo")
     private String pr_cop;
     @JSONField(name = "version")
-    private int pr_version;
+    private String pr_version;
     @JSONField(name = "itemType")
     private String pr_serial;
     @JSONField(name = "invalidQty")
@@ -123,11 +123,11 @@ public class Product implements Serializable {
         this.pr_cop = pr_cop;
     }
 
-    public int getPr_version() {
+    public String getPr_version() {
         return pr_version;
     }
 
-    public void setPr_version(int pr_version) {
+    public void setPr_version(String pr_version) {
         this.pr_version = pr_version;
     }
 

src/main/java/com/uas/eis/entity/VerifyApplyDetail.java

@@ -21,6 +21,56 @@ public class VerifyApplyDetail {
     private String pr_unit;
     @JSONField(name = "qty")
     private Float vad_qty;
+    @JSONField(name = "createdUser")
+    private String va_recorder;
+    @JSONField(name = "createdDateTime")
+    private String va_date;
+    @JSONField(name = "flag")
+    private int flag;
+    @JSONField(name = "custNo")
+    private String pr_kh_user;
+    @JSONField(name="custName")
+    private String cu_name;
+
+    public String getVa_recorder() {
+        return va_recorder;
+    }
+
+    public void setVa_recorder(String va_recorder) {
+        this.va_recorder = va_recorder;
+    }
+
+    public String getVa_date() {
+        return va_date;
+    }
+
+    public void setVa_date(String va_date) {
+        this.va_date = va_date;
+    }
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public void setFlag(int flag) {
+        this.flag = flag;
+    }
+
+    public String getPr_kh_user() {
+        return pr_kh_user;
+    }
+
+    public void setPr_kh_user(String pr_kh_user) {
+        this.pr_kh_user = pr_kh_user;
+    }
+
+    public String getCu_name() {
+        return cu_name;
+    }
+
+    public void setCu_name(String cu_name) {
+        this.cu_name = cu_name;
+    }
 
     public String getVad_code() {
         return vad_code;

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.uas.eis.core.support.TokenProperties;
 import com.uas.eis.dao.BaseDao;
+import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.entity.*;
 import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.sdk.resp.ApiResponse;
@@ -32,12 +33,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public ApiResult<String> syncProduct(String data) {
         Map<Object, Object> store = BaseUtil.parseFormStoreToMap(data);
-        Product product = baseDao.getJdbcTemplate().queryForObject("select nvl(pr_kh_user,'') pr_kh_user,nvl(pr_code,'') pr_code ,nvl" +
-                        "(pr_detail,'') pr_detail ," + "nvl(pr_spec,'') pr_spec ," +
-                "nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') pr_version," +
-                "case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end  pr_serial ,nvl(pr_validdays,'0') pr_validdays ,nvl(pr_msdlevel,'') pr_msdlevel ,nvl(pr_fhelpcode,'') pr_fhelpcode ," +
-                        "nvl(pr_f_115,'') pr_f_115 ,nvl(pr_f_116,'') pr_f_116 ,nvl(pr_f_102,'') pr_f_102" +
-                " ,nvl(pr_kind,'') pr_kind ,nvl(wh_mesc_user,'') pr_whcode,wh_mesn_user pr_whname from product left join Warehouse on pr_whcode=wh_code where pr_id=?",
+        Product product = baseDao.getJdbcTemplate().queryForObject("select case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,pr_code ,pr_detail ,pr_spec,nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') pr_version,case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end pr_serial,nvl(pr_validdays,'0') pr_validdays,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status from mes_product left join customer on pr_kh_user=cu_shortname where pr_id=?",
                 new BeanPropertyRowMapper<Product>(Product.class),store.get("pr_id"));
         product.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"-1")));
         product.setMesUser(tokenConfig.get("mesUser"));
@@ -49,7 +45,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public ApiResult<String> syncMakeBase(String data) {
         Map<Object, Object> store = BaseUtil.parseFormStoreToMap(data);
-        Make make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,ma_custcode,pr_unit,pr_detail,pr_spec,ma_salecode,to_char(ma_planbegindate,'yyyy-MM-dd') ma_planbegindate,to_char(ma_planenddate,'yyyy-MM-dd') ma_planenddate,nvl(ma_cop,'BYT') ma_cop,'S' status,to_char(ma_date,'yyyy-MM-dd HH24:mi:ss') ma_date,ma_recorder,nvl(ma_version,0) ma_version,erpid,wc_id,pr_id,to_char(ma_modifydate,'yyyy-MM-dd HH24:mi:ss') ma_modifydate,ma_modifier from make left join product on ma_prodcode=pr_code left join workcenter on ma_wccode=wc_code where ma_id=?",
+        Make make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,nvl(cu_mescode,ma_custcode) ma_custcode,pr_unit,pr_detail,pr_spec,ma_salecode,to_char(ma_planbegindate,'yyyy-MM-dd') ma_planbegindate,to_char(ma_planenddate,'yyyy-MM-dd') ma_planenddate,nvl(ma_cop,'BYT') ma_cop,'S' status,to_char(ma_date,'yyyy-MM-dd HH24:mi:ss') ma_date,ma_recorder,nvl(ma_version,0) ma_version,ma_id,wc_id,pr_id,to_char(ma_modifydate,'yyyy-MM-dd HH24:mi:ss') ma_modifydate,ma_modifier from make left join product on ma_prodcode=pr_code left join workcenter on ma_wccode=wc_code left join customer on ma_custcode=cu_code where ma_id=?",
                 new BeanPropertyRowMapper<Make>(Make.class),store.get("ma_id"));
         make.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"-1")));
         make.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
@@ -60,8 +56,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public ApiResult<String> syncMakeBaseDetail(String data) {
         Map<Object, Object> store = BaseUtil.parseFormStoreToMap(data);
-        MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select mm_code,mm_id,mm_prodcode,pr_detail,pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,case when mm_ifrep=-1 then 'alternative' else 'main' end type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,nvl(bo_version,0) bo_version,nvl(bo_cop,'BYT') bo_cop,mm_repprodcode,mm_balance,ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder " +
-                        "from MakeMaterial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=ma_bomid left join MakeMaterialChangeDet on md_makecode=ma_code and md_mmdetno=mm_detno left join MakeMaterialChange on mc_id=md_mcid where mm_id=?",
+        MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select mm_code,erpid,mm_prodcode,pr_detail,pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,case when mm_ifrep=-1 then 'alternative' else 'main' end type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,nvl(bo_version,0) bo_version,nvl(bo_cop,'BYT') bo_cop,mm_repprodcode,mm_balance,nvl(cu_mescode,ma_custcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder,flag from mes_makematerial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=mm_bomid left join MakeMaterialChangeDet on md_makecode=ma_code and md_mmdetno=mm_detno left join MakeMaterialChange on mc_id=md_mcid left join customer on ma_custcode=cu_code where mm_id=? order by mm_detno",
                 new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class),store.get("mm_id"));
         makeMaterial.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"-1")));
         makeMaterial.setMesUser(tokenConfig.get("mesUser"));
@@ -72,12 +67,20 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public ApiResult<String> syncUpdateReceiveByErp(String data) {
         Map<Object, Object> store = BaseUtil.parseFormStoreToMap(data);
-        VerifyApply verifyApply = baseDao.getJdbcTemplate().queryForObject("select va_id,va_mescode,va_code,to_char(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,va_vendcode,va_vendname,va_currency,va_rate,va_paymentscode,va_payments,va_transport,va_sendcode,va_emcode,va_emname,wh_mesc_user va_whcode,wh_mesn_user va_whname,va_departmentcode,va_department,va_recorder,nvl(va_cop,'BYT') va_cop,va_remark,va_ancode,va_factory,0 version,va_custcode,va_custname,va_type,va_pucode,case when nvl(va_pucode,' ')=' ' then 0 else (select pu_id from purchase where pu_code=va_pucode) end pu_id,va_status,1 posted,to_char(va_auditdate,'yyyy-MM-dd HH24:mi:ss') va_auditdate,va_auditman from VerifyApply left join Warehouse on va_whcode=wh_code where va_statuscode='AUDITED' and va_id=?",
+        VerifyApply verifyApply = baseDao.getJdbcTemplate().queryForObject("select va_id,va_mescode,va_code,to_char" +
+                        "(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,va_vendcode,va_vendname,va_currency,va_rate,va_paymentscode,va_payments,va_transport,va_sendcode,va_emcode,va_emname,va_departmentcode,va_department,va_recorder,nvl(va_cop,'BYT') va_cop,va_remark,va_ancode,va_factory,0 version,va_type,va_pucode,case when nvl(va_pucode,' ')=' ' then 0 else (select pu_id from purchase " +
+                        "where pu_code=va_pucode) end pu_id,va_status,1 posted,to_char(va_auditdate,'yyyy-MM-dd HH24:mi:ss') va_auditdate,va_auditman from VerifyApply where va_statuscode='AUDITED' and va_id=?",
                 new BeanPropertyRowMapper<VerifyApply>(VerifyApply.class), store.get("va_id"));
+        SqlRowList rs = baseDao.queryForRowSet("select case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end cu_code,cu_name from verifyapplydetail left join product on vad_prodcode=pr_code left join customer on cu_shortname=pr_kh_user where vad_vaid=114192 order by vad_detno");
+        if (rs.next()){
+            verifyApply.setVa_custcode(rs.getString("cu_code"));
+            verifyApply.setVa_custname(rs.getString("cu_name"));
+        }
         verifyApply.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
         verifyApply.setMesUser(tokenConfig.get("mesUser"));
         verifyApply.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"-1")));
-        List<VerifyApplyDetail> verifyApplyDetails = baseDao.query("select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,sum(nvl(vad_qty,0)) vad_qty from verifyapplydetail left join product on vad_prodcode=pr_code where vad_vaid=" + verifyApply.getVa_id() + " group by vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit", VerifyApplyDetail.class);
+        List<VerifyApplyDetail> verifyApplyDetails = baseDao.query("select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,va_recorder,va_date,pr_kh_user,cu_name,sum(nvl(vad_qty,0)) vad_qty from ( select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,vad_qty,va_recorder,to_char(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,cu_name from verifyapplydetail left join VerifyApply on va_id=vad_vaid left join product on vad_prodcode=pr_code " +
+                "left join customer on cu_shortname=pr_kh_user where vad_vaid="+store.get("va_id")+") group by vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,va_recorder,va_date,pr_kh_user,cu_name", VerifyApplyDetail.class);
         verifyApply.setDetail(verifyApplyDetails);
         return syncMES(JSON.toJSONString(verifyApply, SerializerFeature.WriteMapNullValue).replace("null","\"\""),tokenConfig.get("syncUpdateReceiveByErp"));
     }

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

@@ -41,13 +41,14 @@ public class MESServiceImpl implements MESService {
         if ("".equals(mesCode)){
             return ApiResponse.failRsp("10011",request.getHeader("RequestId"),"MES编号不能为空！");
         }
-        VerifyApply verifyApply = baseDao.getJdbcTemplate().queryForObject("select va_id,va_mescode,va_code,to_char(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,va_vendcode,va_vendname,va_currency,va_rate,va_paymentscode,va_payments,va_transport,va_sendcode,va_emcode,va_emname,wh_mesc_user va_whcode,wh_mesn_user va_whname,va_departmentcode,va_department,va_recorder,nvl(va_cop,'BYT') va_cop,va_remark,va_ancode,va_factory,0 version,va_custcode,va_custname,va_type,va_pucode,case when nvl(va_pucode,' ')=' ' then 0 else (select pu_id from purchase where pu_code=va_pucode) end pu_id,va_status,1 posted,to_char(va_auditdate,'yyyy-MM-dd HH24:mi:ss') va_auditdate,va_auditman " +
-                        "from VerifyApply left join Warehouse on va_whcode=wh_code where va_statuscode='AUDITED' and va_mescode=?",
+        VerifyApply verifyApply = baseDao.getJdbcTemplate().queryForObject("select va_id,va_mescode,va_code,to_char(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,va_vendcode,va_vendname,va_currency,va_rate,va_paymentscode,va_payments,va_transport,va_sendcode,va_emcode,va_emname,va_departmentcode,va_department,va_recorder,nvl(va_cop,'BYT') va_cop,va_remark,va_ancode,va_factory,0 version,va_type,va_pucode,case when nvl(va_pucode,' ')=' ' then 0 else (select pu_id from purchase where pu_code=va_pucode) end pu_id,va_status,1 posted,to_char(va_auditdate,'yyyy-MM-dd HH24:mi:ss') va_auditdate,va_auditman " +
+                        "from VerifyApply where va_statuscode='AUDITED' and va_mescode=?",
                 new BeanPropertyRowMapper<VerifyApply>(VerifyApply.class), mesCode);
         if (verifyApply==null) {
             return ApiResponse.failRsp("10012",request.getHeader("RequestId"),"单据未审核或不存在，请确认！");
         }
-        List<VerifyApplyDetail> verifyApplyDetails = baseDao.query("select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,sum(nvl(vad_qty,0)) vad_qty from verifyapplydetail left join product on vad_prodcode=pr_code where vad_vaid=" + verifyApply.getVa_id() + " group by vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit", VerifyApplyDetail.class);
+        List<VerifyApplyDetail> verifyApplyDetails = baseDao.query("select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,va_recorder,va_date,pr_kh_user,cu_name,sum(nvl(vad_qty,0)) vad_qty from ( select vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,vad_qty,va_recorder,to_char(va_date,'yyyy-MM-dd HH24:mi:ss') va_date,case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,cu_name from verifyapplydetail left join VerifyApply on va_id=vad_vaid left join product on vad_prodcode=pr_code " +
+        "left join customer on cu_shortname=pr_kh_user where vad_vaid="+verifyApply.getVa_id()+") group by vad_code,vad_prodcode,pr_detail,pr_spec,pr_unit,va_recorder,va_date,pr_kh_user,cu_name", VerifyApplyDetail.class);
         verifyApply.setDetail(verifyApplyDetails);
         String s = JSON.toJSONString(verifyApply, SerializerFeature.WriteMapNullValue);
         return ApiResponse.successRsp("0","获取成功！",request.getHeader("RequestId"),s);
@@ -61,9 +62,11 @@ public class MESServiceImpl implements MESService {
         String caller="VerifyApply!ToOtherIn";
         String type="其它入库单";
         String sellerName="";
+        String whcode="";
         for (int i = 0; i <jsonArray.size() ; i++) {
             JSONObject jsonObject = JSON.parseObject(StringUtil.nvl(jsonArray.get(i), ""));
             Object mesCode = StringUtil.nvl(jsonObject.get("mesCode"),"");
+            whcode= StringUtil.nvl(jsonObject.get("whNo"), "");
             if ("".equals(mesCode)){
                 return ApiResponse.failRsp("10011",request.getHeader("RequestId"),"MES编号不能为空！");
             }
@@ -102,6 +105,16 @@ public class MESServiceImpl implements MESService {
             }
             sellerName = StringUtil.nvl(jsonObject.get("sellerName"), "管理员");
         }
+        if ("".equals(whcode)){
+            return ApiResponse.failRsp("10015",request.getHeader("RequestId"),"MES仓库编号不能为空！");
+        }
+        int coun = baseDao.getCount("select count(1) from customtabledetail left join customtable on " +
+                "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
+        if (coun<=0){
+            return ApiResponse.failRsp("10016",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
+        }
+        Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "cd_varchar50_1='" + whcode + "'");
+
         int piid ;
         Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_name=?",
                 new BeanPropertyRowMapper<Employee>(Employee.class), sellerName);
@@ -110,22 +123,21 @@ public class MESServiceImpl implements MESService {
         piid = key.getId();
         // 转入明细
         transferRepository.transferDetail(caller, vaid, key,employee);
-        if ("VerifyApply!ToPurcIn".equals(caller)) {
-            if (piid != 0) {
-                baseDao.execute("update prodiodetail set pd_prodid=(select pr_id from product where pd_prodcode=pr_code) where pd_piid=" + piid
-                        + " and nvl(pd_prodcode,' ')<>' '");
-                baseDao.execute("update prodiodetail set pd_whid=(select wh_id from warehouse where wh_code=pd_whcode) where pd_piid=" + piid
-                        + " and nvl(pd_whcode,' ')<>' '");
-                baseDao.updateByCondition("ProdInOut",
-                        "pi_total=(SELECT round(sum(nvl(pd_orderprice,0)*(nvl(pd_inqty,0)+nvl(pd_outqty,0))),2) FROM ProdIODetail WHERE pd_piid="
-                                + piid + ")", "pi_id=" + piid);
-                baseDao.updateByCondition("ProdInOut", "pi_totalupper=L2U(nvl(pi_total,0))", "pi_id=" + piid);
+        if (piid != 0) {
+            baseDao.updateByCondition("prodiodetail", "pd_whcode='"+warehouses[0]+"',pd_whname='"+warehouses[1]+"'", "pd_piid=" + piid);
+            baseDao.updateByCondition("prodinout", "pi_whcode='"+warehouses[0]+"',pi_whname='"+warehouses[1]+"'", "pi_id=" + piid);
+            baseDao.execute("update prodiodetail set pd_prodid=(select pr_id from product where pd_prodcode=pr_code) where pd_piid=" + piid
+                    + " and nvl(pd_prodcode,' ')<>' '");
+            baseDao.execute("update prodiodetail set pd_whid=(select wh_id from warehouse where wh_code=pd_whcode) where pd_piid=" + piid
+                    + " and nvl(pd_whcode,' ')<>' '");
+            baseDao.updateByCondition("ProdInOut",
+                    "pi_total=(SELECT round(sum(nvl(pd_orderprice,0)*(nvl(pd_inqty,0)+nvl(pd_outqty,0))),2) FROM ProdIODetail WHERE pd_piid="
+                            + piid + ")", "pi_id=" + piid);
+            baseDao.updateByCondition("ProdInOut", "pi_totalupper=L2U(nvl(pi_total,0))", "pi_id=" + piid);
+            if ("VerifyApply!ToPurcIn".equals(caller)) {
                 baseDao.execute("Insert into ProdChargeDetail(pd_id,pd_piid,pd_detno,pd_type,pd_amount,pd_currency,pd_rate) "
                         + "select ProdChargeDetail_seq.nextval, " + piid + ", pd_detno, pd_type,pd_amount,pd_currency,pd_rate "
                         + "from ProdChargeDetailAN where PD_ANID=" + vaid);
-            }
-            //
-            if (piid != 0) {
                 SqlRowList rs = baseDao.queryForRowSet("select vad_pucode,vad_pudetno,vad_qty from VerifyApplyDetail where vad_vaid=" + vaid);
                 String pCode = null;
                 int pDetno = 0;
@@ -182,11 +194,11 @@ public class MESServiceImpl implements MESService {
             if ("".equals(whcode)){
                 return ApiResponse.failRsp("10073",request.getHeader("RequestId"),"MES仓库编号不能为空！");
             }
-            int count = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode + "'");
+            int count = baseDao.getCount("select count(1) from customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
             if (count<=0){
                 return ApiResponse.failRsp("10074",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode + "'");
+            Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "cd_varchar50_1='" + whcode + "'");
             id = baseDao.getSeqId("PRODINOUT_SEQ");
             code = baseDao.sGetMaxNumber("ProdInOut!Make!In", 2);
             sqls.add("insert into prodinout (pi_id,pi_inoutno,pi_class,pi_date,pi_statuscode,pi_status,pi_whcode,pi_whname,pi_departmentcode,pi_departmentname,pi_emcode,pi_emname,pi_invostatuscode,pi_invostatus,pi_recordman,pi_recorddate,pi_printstatuscode,pi_printstatus) values ("+id+",'"+code+"','完工入库单',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPOST'," + "'未过账','"+warehouses[0]+"','"+warehouses[1]+"','"+map5.get("FNumber")+"','"+map5.get("FName")+ "','"+map6.get("FNumber")+"','"+map7.get("FName")+"','ENTERING','在录入','"+map8.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPRINT','未打印')");
@@ -366,11 +378,11 @@ public class MESServiceImpl implements MESService {
             if ("".equals(whcode)){
                 return ApiResponse.failRsp("10034",request.getHeader("RequestId"),"MES仓库编号不能为空！");
             }
-            int count = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode + "'");
+            int count = baseDao.getCount("select count(1) from customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
             if (count<=0){
                 return ApiResponse.failRsp("10035",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode + "'");
+            Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "cd_varchar50_1='" + whcode + "'");
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
                     "pd_outqty,pd_whcode,pd_whname,pd_remark) " +
                     "values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','其它出库单',"+detno+",'"+itemNo+
@@ -429,12 +441,13 @@ public class MESServiceImpl implements MESService {
             // 标示领料单的拨出单号
             baseDao.execute("update ProdInOut set pi_fromcode='" + bccode + "' where pi_id=" + llpiid);
         }
-        Object mmwhcode = baseDao.getFieldDataByCondition("MakeMaterial", "min(mm_whcode)", " nvl(mm_whcode,' ')<>' '" + " and mm_code in ('" + macode + "')");
+        /*Object mmwhcode = baseDao.getFieldDataByCondition("MakeMaterial", "min(mm_whcode)", " nvl(mm_whcode,' ')<>' '" + " and mm_code in ('" + macode + "')");
         Object mmwhname="";
         if (mmwhcode!=null&&!"".equals(mmwhcode.toString())){
             mmwhname = baseDao.getFieldDataByCondition("warehouse", "min(wh_description)",
                     "wh_code in ('" + mmwhcode + "'");
-        }
+        }*/
+
         JSONArray array = data.get("detail");
         int detno=1;
         for (int i = 0; i <array.size(); i++) {
@@ -454,20 +467,36 @@ public class MESServiceImpl implements MESService {
             if ("".equals(whcode)){
                 return ApiResponse.failRsp("10043",request.getHeader("RequestId"),"发料仓库不能为空！");
             }
-            int count = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode + "'");
+            int count = baseDao.getCount("select count(1) from customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
             if (count<=0){
                 return ApiResponse.failRsp("10044",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode + "'");
+            Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "cd_varchar50_1='" + whcode + "'");
             String fSourceInterId = StringUtil.nvl(object.get("FSourceInterId"), "");
             String ficmoBillNo = StringUtil.nvl(object.get("FICMOBillNo"), "");
+            Map<Object, Object> map2 = JSONUtil.toMap(StringUtil.nvl(object.get("FSCStockID2"), "{}"));
+            String whcode2 = StringUtil.nvl(map2.get("FNumber"), "");
+            String whname2 = StringUtil.nvl(map2.get("FName"), "");
+            if ("".equals(whcode2)){
+                return ApiResponse.failRsp("10043",request.getHeader("RequestId"),"物料所在仓库不能为空！");
+            }
+            int count2 = baseDao.getCount("select count(1) from customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and " +
+                    "ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode2 + "'");
+            if (count2<=0){
+                return ApiResponse.failRsp("10044",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
+            }
+            Object[] warehouses2 = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description",
+                    "cd_varchar50_1='" + whcode2 + "'");
+
             Object lineId = object.get("lineId");
             Object mmdetno = baseDao.getFieldDataByCondition("MakeMaterial", "mm_detno", "mm_id in (" + lineId+")");
             if(bccode!=null) {
                 sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
                         "pd_outqty,pd_whcode,pd_whname,pd_inwhcode,pd_inwhname) " +
                         "values (PRODIODETAIL_SEQ.nextval," + bcpiid + ",'" + bccode + "','"+bcpiclass+"'," + detno + ",'" + itemNo +
-                        "'," + qty + ",'" + mmwhcode + "','" + mmwhname + "','" + warehouses[0] + "','" + warehouses[1] + "')");
+                        "'," + qty + ",'" + warehouses2[0] + "','" + warehouses2[1] + "','" + warehouses[0] + "','" + warehouses[1] + "')");
             }
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
                     "pd_outqty,pd_whcode,pd_whname,pd_ordercode,pd_orderdetno) " +
@@ -495,9 +524,12 @@ public class MESServiceImpl implements MESService {
             Map<Object, Object> map4 = JSONUtil.toMap(StringUtil.valueOf(jsonObject2.get("FSManagerID")));
             Map<Object, Object> map5 = JSONUtil.toMap(StringUtil.valueOf(jsonObject2.get("FBillerID")));
             id = baseDao.getSeqId("PRODINOUT_SEQ");
-            code = baseDao.sGetMaxNumber("ProdInOut!Make!Return", 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) " +
-                    "values ("+id+",'"+code+"','生产退料单',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPOST','未过账','"+map1.get("FNumber")+"','"+map1.get("FName")+"','"+map4.get("FNumber")+"','"+map4.get("FName")+"','ENTERING','在录入','"+map5.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPRINT','未打印','"+map2.get("FName")+"')");
+            code = baseDao.sGetMaxNumber("ProdInOut!AppropriationOut", 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_inoutman) " +
+                    "values ("+id+",'"+code+"','拨出单',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss')," +
+                    "'UNPOST','未过账','"+map1.get("FNumber")+"','"+map1.get("FName")+"','"+map4.get("FNumber")+"','"+map4.get("FName")+"','ENTERING','在录入','"+map5.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPRINT','未打印','"+map3.get("FName")+"')");
         }
         JSONArray array = data.get("detail");
         int detno=1;
@@ -519,19 +551,34 @@ public class MESServiceImpl implements MESService {
             if ("".equals(whcode)){
                 return ApiResponse.failRsp("10053",request.getHeader("RequestId"),"仓库编号不能为空！");
             }
-            int count = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode + "'");
+            int count = baseDao.getCount("select count(1) from customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
             if (count<=0){
                 return ApiResponse.failRsp("10054",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode + "'");
+            Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "cd_varchar50_1='" + whcode + "'");
+            Map<Object, Object> map2 = JSONUtil.toMap(StringUtil.nvl(object.get("FSCStockID2"), "{}"));
+            String whcode2 = StringUtil.nvl(map2.get("FNumber"), "");
+            String whname2 = StringUtil.nvl(map2.get("FName"), "");
+            if ("".equals(whcode2)){
+                return ApiResponse.failRsp("10055",request.getHeader("RequestId"),"物料退回仓库不能为空！");
+            }
+            int count2 = baseDao.getCount("select count(1) from customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and " +
+                    "ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode2 + "'");
+            if (count2<=0){
+                return ApiResponse.failRsp("10074",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
+            }
+            Object[] warehouses2 = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description",
+                    "cd_varchar50_1='" + whcode2 + "'");
+
             String ficmoBillNo = StringUtil.nvl(object.get("FICMOBillNo"), "");
             String fBatchNo = StringUtil.nvl(object.get("FBatchNo"), "");
             Object lineId = object.get("lineId");
             Object mmdetno = baseDao.getFieldDataByCondition("MakeMaterial", "mm_detno", "mm_id in (" + lineId+")");
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
-                    "pd_inqty,pd_whcode,pd_whname,pd_remark,pd_batchcode,pd_ordercode,pd_orderdetno) " +
-                    "values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','生产退料单',"+detno+",'"+itemNo+
-                    "',"+qty+",'"+warehouses[0]+"','"+warehouses[1]+"','"+fnote+"','"+fBatchNo+"','"+ficmoBillNo+"',"+mmdetno+ ")");
+                    "pd_outqty,pd_whcode,pd_whname,pd_inwhcode,pd_inwhname) " +
+                    "values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','拨出单',"+detno+",'"+itemNo+"',"+qty+",'"+warehouses[0]+"','"+warehouses[1]+"','"+warehouses2[0]+"','"+warehouses2[1]+"')");
             detno++;
         }
         baseDao.execute(sqls);
@@ -579,22 +626,29 @@ public class MESServiceImpl implements MESService {
             if ("".equals(whcode)){
                 return ApiResponse.failRsp("10063",request.getHeader("RequestId"),"发货仓库不能为空！");
             }
-            int count = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode + "'");
+            int count = baseDao.getCount("select count(1) from customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and " +
+                    "ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode + "'");
             if (count<=0){
-                return ApiResponse.failRsp("10064",request.getHeader("RequestId"),"发货仓库编号在ERP没有对应关系，请联系管理员新增！");
+                return ApiResponse.failRsp("10064",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode + "'");
-            Map<Object, Object> map2 = JSONUtil.toMap(StringUtil.valueOf(object.get("FDCStockID1")));
+            Object[] warehouses = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on " +
+                            "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description",
+                    "cd_varchar50_1='" + whcode + "'");Map<Object, Object> map2 = JSONUtil.toMap(StringUtil.valueOf(object.get("FDCStockID1")));
             String whcode2 = StringUtil.nvl(map2.get("FNumber"), "");
             String whname2 = StringUtil.nvl(map2.get("FName"), "");
             if ("".equals(whcode2)){
                 return ApiResponse.failRsp("10065",request.getHeader("RequestId"),"收货仓库不能为空！");
             }
-            int count2 = baseDao.getCount("select count(1) from Warehouse where wh_mesc_user='" + whcode2 + "'");
+            int count2 = baseDao.getCount("select count(1) from customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code where ct_statuscode='AUDITED' and " +
+                    "ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode2 + "'");
             if (count2<=0){
-                return ApiResponse.failRsp("10066",request.getHeader("RequestId"),"收货仓库编号在ERP没有对应关系，请联系管理员新增！");
+                return ApiResponse.failRsp("10066",request.getHeader("RequestId"),"MES仓库编号在ERP没有对应关系，请联系管理员新增！");
             }
-            Object[] warehouses2 = baseDao.getFieldsDataByCondition("Warehouse", "wh_code,wh_description", "wh_mesc_user='" + whcode2 + "'");
+            Object[] warehouses2 = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on " +
+                    "cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description",
+                    "cd_varchar50_1='" + whcode2 + "'");
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
                     "pd_outqty,pd_whcode,pd_whname,pd_inwhcode,pd_inwhname) values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','拨出单',"+detno+",'"+itemNo+"',"+qty+",'"+warehouses[0]+"','"+warehouses[1]+"','"+warehouses2[0]+"','"+warehouses2[1]+"')");
             detno++;

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

@@ -40,11 +40,7 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
     public void syncProducts() {
         SqlRowList rs = baseDao.queryForRowSet("select id from mes_product where status='W' order by id");
         while (rs.next()){
-            Product product = baseDao.getJdbcTemplate().queryForObject("select pr_kh_user,pr_code ,pr_detail ," +
-                            "pr_spec ,nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') " +
-                            "pr_version,case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end pr_serial,nvl(pr_validdays,'0') pr_validdays,pr_msdlevel ,pr_fhelpcode ," +
-                            "pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,wh_mesc_user pr_whcode,wh_mesn_user pr_whname,flag," +
-                            "pr_statuscode,pr_status from mes_product left join Warehouse on pr_whcode=wh_code where id=?",
+            Product product = baseDao.getJdbcTemplate().queryForObject("select case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,pr_code ,pr_detail ,pr_spec,nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') pr_version,case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end pr_serial,nvl(pr_validdays,'0') pr_validdays,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status from mes_product left join customer on pr_kh_user=cu_shortname where id=?",
                     new BeanPropertyRowMapper<Product>(Product.class), rs.getInt("id"));
             product.setMesUser(tokenConfig.get("mesUser"));
             product.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
@@ -65,7 +61,8 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
     public void syncMakeBases() {
         SqlRowList rs = baseDao.queryForRowSet("select id from mes_make where status='W' order by id");
         while (rs.next()){
-            Make make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,ma_custcode,pr_unit,pr_detail,pr_spec,ma_salecode,to_char(ma_planbegindate,'yyyy-MM-dd') ma_planbegindate,to_char(ma_planenddate,'yyyy-MM-dd') ma_planenddate,nvl(ma_cop,'BYT') ma_cop,'S' status,to_char(ma_date,'yyyy-MM-dd HH24:mi:ss') ma_date,ma_recorder,nvl(ma_version,0) ma_version,erpid,wc_id,pr_id,to_char(ma_modifydate,'yyyy-MM-dd HH24:mi:ss') ma_modifydate,ma_modifier,flag from mes_make left join product on ma_prodcode=pr_code left join workcenter on ma_wccode=wc_code where id=?",new BeanPropertyRowMapper<Make>(Make.class),rs.getInt("id"));
+            Make make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,nvl(cu_mescode,ma_custcode) ma_custcode,pr_unit,pr_detail,pr_spec,ma_salecode,to_char(ma_planbegindate,'yyyy-MM-dd') ma_planbegindate,to_char(ma_planenddate,'yyyy-MM-dd') ma_planenddate,nvl(ma_cop,'BYT') ma_cop,'S' status,to_char(ma_date,'yyyy-MM-dd HH24:mi:ss') ma_date,ma_recorder,nvl(ma_version,0) ma_version,erpid,wc_id,pr_id,to_char(ma_modifydate,'yyyy-MM-dd HH24:mi:ss') ma_modifydate,ma_modifier,flag from " +
+                    "mes_make left join product on ma_prodcode=pr_code left join workcenter on ma_wccode=wc_code left join customer on ma_custcode=cu_code where id=?",new BeanPropertyRowMapper<Make>(Make.class),rs.getInt("id"));
             make.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
             make.setMesUser(tokenConfig.get("mesUser"));
             Map<String, Object> map = syncMES(JSON.toJSONString(make, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBase"));
@@ -87,7 +84,7 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
         while (rs.next()){
             int count = baseDao.getCount("select count(1) from mes_make where status='D' and action<>'D' and ma_code='" + rs.getGeneralString("mm_code") + "'");
             if (count>0) {
-                MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select mm_code,erpid,mm_prodcode,pr_detail,pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,case when mm_ifrep=-1 then 'alternative' else 'main' end type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,nvl(bo_version,0) bo_version,nvl(bo_cop,'BYT') bo_cop,mm_repprodcode,mm_balance,ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder,flag from mes_makematerial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=mm_bomid left join MakeMaterialChangeDet on md_makecode=ma_code and md_mmdetno=mm_detno left join MakeMaterialChange on mc_id=md_mcid where id=? order by mm_detno", new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class), rs.getInt("id"));
+                MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select mm_code,erpid,mm_prodcode,pr_detail,pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,case when mm_ifrep=-1 then 'alternative' else 'main' end type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,nvl(bo_version,0) bo_version,nvl(bo_cop,'BYT') bo_cop,mm_repprodcode,mm_balance,nvl(cu_mescode,ma_custcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder,flag from mes_makematerial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=mm_bomid left join MakeMaterialChangeDet on md_makecode=ma_code and md_mmdetno=mm_detno left join MakeMaterialChange on mc_id=md_mcid left join customer on ma_custcode=cu_code where id=? order by mm_detno", new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class), rs.getInt("id"));
                 makeMaterial.setMesUser(tokenConfig.get("mesUser"));
                 makeMaterial.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
                 Map<String, Object> map = syncMES(JSON.toJSONString(makeMaterial, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBaseDetail"));

src/main/resources/application-prod.yml

@@ -16,11 +16,11 @@ server:
 
 Task:
     SyncProductsMethod: syncProducts
-    SyncProductsCron: 0 1/5 * * * ?
+    SyncProductsCron: 0 0/1 * * * ?
     SyncMakeBasesMethod: syncMakeBases
-    SyncMakeBasesCron: 0 2/5 * * * ?
+    SyncMakeBasesCron: 0 0/1 * * * ?
     SyncMakeBaseDetailsMethod: syncMakeBaseDetails
-    SyncMakeBaseDetailsCron: 0 3/5 * * * ?
+    SyncMakeBaseDetailsCron: 0 0/1 * * * ?
 
 action:
     api_action: /EIS/api,/EIS/mes,/EIS/erp