上传委外工单

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

@@ -44,7 +44,7 @@ public class Make {
     @JSONField(name = "fWorkShop")
     private String wc_id;
     @JSONField(name = "fCostOBJID")
-    private String pr_id;
+    private String ma_kind;
     @JSONField(name = "modifiedDateTime")
     private String ma_modifydate;
     @JSONField(name = "modifiedUser")
@@ -56,6 +56,14 @@ public class Make {
     @JSONField(name = "flag")
     private int flag;
 
+    public String getMa_kind() {
+        return ma_kind;
+    }
+
+    public void setMa_kind(String ma_kind) {
+        this.ma_kind = ma_kind;
+    }
+
     public int getErpid() {
         return erpid;
     }
@@ -216,13 +224,6 @@ public class Make {
         this.wc_id = wc_id;
     }
 
-    public String getPr_id() {
-        return pr_id;
-    }
-
-    public void setPr_id(String pr_id) {
-        this.pr_id = pr_id;
-    }
 
     public String getMa_modifydate() {
         return ma_modifydate;

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

@@ -80,7 +80,7 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
             if (count>0){
                 status="C";
             }
-            Make make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,nvl(cu_mescode,'BYT') 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,'"+status+"' 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 make = baseDao.getJdbcTemplate().queryForObject("select ma_code,ma_prodcode,ma_qty,nvl(cu_mescode,'BYT') 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,'"+status+"' status,to_char(ma_date,'yyyy-MM-dd HH24:mi:ss') ma_date,ma_recorder,nvl(ma_version,0) ma_version,erpid,wc_id,ma_kind,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"));