增加中类，默认仓库转化成MES对应仓库编号

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

@@ -42,6 +42,8 @@ public class Product implements Serializable {
     private String pr_f_102;
     @JSONField(name = "itemCategory")
     private String pr_kind;
+    @JSONField(name = "itemCategory1")
+    private String pr_kind2;
     @JSONField(name = "erpLoc")
     private String pr_whcode;
     @JSONField(name = "mesUser")
@@ -51,6 +53,14 @@ public class Product implements Serializable {
     @JSONField(name = "flag")
     private int flag;
 
+    public String getPr_kind2() {
+        return pr_kind2;
+    }
+
+    public void setPr_kind2(String pr_kind2) {
+        this.pr_kind2 = pr_kind2;
+    }
+
     public String getPr_kind3() {
         return pr_kind3;
     }

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

@@ -38,8 +38,17 @@ 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 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 ,replace(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,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status,pr_whcode,pr_kind3 from mes_product left join customer on pr_kh_user=cu_shortname 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 ,replace(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,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status,pr_whcode,pr_kind3,pr_kind2 from mes_product left join customer on pr_kh_user=cu_shortname where pr_id=?",
                 new BeanPropertyRowMapper<Product>(Product.class),store.get("pr_id"));
+        //获取MES对应仓库
+        String prWhcode = product.getPr_whcode();
+        if (prWhcode!=null&&!"".equals(prWhcode)) {
+            SqlRowList rs = baseDao.queryForRowSet("select * from customtabledetail left join customtable on " +
+                    "ct_id=cd_ctid where ct_caller='MESWarehouse' and cd_varchar50_3='" + prWhcode + "' order by ct_id desc,cd_id desc");
+            if (rs.next()){
+                product.setPr_whcode(rs.getGeneralString("cd_varchar50_1"));
+            }
+        }
         product.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"-1")));
         product.setMesUser(tokenConfig.get("mesUser"));
         product.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));

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

@@ -44,8 +44,16 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
         try {
             SqlRowList rs = baseDao.queryForRowSet("select id from mes_product where status='W' order by id");
             while (rs.next()){
-                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 ,replace(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,pr_msdlevel ,pr_kind3 ,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=?",
+                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 ,replace(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,pr_msdlevel ,pr_kind3 ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status,pr_whcode,pr_kind2 from mes_product left join customer on pr_kh_user=cu_shortname where id=?",
                         new BeanPropertyRowMapper<Product>(Product.class), rs.getInt("id"));
+                //获取MES对应仓库
+                String prWhcode = product.getPr_whcode();
+                if (prWhcode!=null&&!"".equals(prWhcode)) {
+                    SqlRowList rowSet = baseDao.queryForRowSet("select cd_varchar50_1,cd_varchar50_2,cd_varchar50_3,cd_varchar50_5 from customtabledetail left join customtable on ct_id=cd_ctid where ct_caller='MESWarehouse' and cd_varchar50_3='" + prWhcode + "' order by ct_id desc,cd_id desc");
+                    if (rowSet.next()){
+                        product.setPr_whcode(rowSet.getGeneralString("cd_varchar50_1"));
+                    }
+                }
                 product.setMesUser(tokenConfig.get("mesUser"));
                 product.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
                 Map<String, Object> map = syncMES(JSON.toJSONString(product, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncProduct"));