Browse Source

物料资料增加检验方式

koul 2 years ago
parent
commit
9ae20cd95c

+ 10 - 0
src/main/java/com/uas/eis/entity/Product.java

@@ -44,6 +44,8 @@ public class Product implements Serializable {
     private String pr_kind;
     @JSONField(name = "itemCategory1")
     private String pr_kind2;
+    @JSONField(name = "itemCategory2")
+    private String pr_acceptmethod;
     @JSONField(name = "erpLoc")
     private String pr_whcode;
     @JSONField(name = "mesUser")
@@ -53,6 +55,14 @@ public class Product implements Serializable {
     @JSONField(name = "flag")
     private int flag;
 
+    public String getPr_acceptmethod() {
+        return pr_acceptmethod;
+    }
+
+    public void setPr_acceptmethod(String pr_acceptmethod) {
+        this.pr_acceptmethod = pr_acceptmethod;
+    }
+
     public String getPr_kind2() {
         return pr_kind2;
     }

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

@@ -46,7 +46,7 @@ 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,pr_whcode,pr_kind2 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,pr_acceptmethod 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();