【功能完善】【设计变更评审单上传MES逻辑更改】

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

@@ -26,27 +26,33 @@ public class EcrMakeDetail {
     private String emd_controlpoint;
     @JSONField(name = "rmk1")
     private String emd_detno;
+    @JSONField(name = "rmk2")
+    private String rmk2;
+    @JSONField(name = "rmk3")
+    private String rmk3;
+    @JSONField(name = "rmk4")
+    private String rmk4;
+    @JSONField(name = "rmk5")
+    private String rmk5;
+    @JSONField(name = "ecrd_type")
+    private String ecrd_type;
+    @JSONField(name = "ecrd_soncode")
+    private String ecrd_soncode;
+    @JSONField(name = "ecrd_newbaseqty")
+    private Double ecrd_newbaseqty;
+    @JSONField(name = "ecrd_repcode")
+    private String ecrd_repcode;
+    @JSONField(name = "ecrd_oldbaseqty")
+    private Double ecrd_oldbaseqty;
+    @JSONField(name = "ecrd_location")
+    private String ecrd_location;
+    @JSONField(name = "ecrd_oldlocation")
+    private String ecrd_oldlocation;
     @JSONField(name = "mesUser")
     private String mesUser;
     @JSONField(name = "mesPwd")
     private String mesPwd;
 
-    public String getEmd_ifzhix() {
-        return emd_ifzhix;
-    }
-
-    public void setEmd_ifzhix(String emd_ifzhix) {
-        this.emd_ifzhix = emd_ifzhix;
-    }
-
-    public String getEmd_controlpoint() {
-        return emd_controlpoint;
-    }
-
-    public void setEmd_controlpoint(String emd_controlpoint) {
-        this.emd_controlpoint = emd_controlpoint;
-    }
-
     public String getEcr_code() {
         return ecr_code;
     }
@@ -95,6 +101,22 @@ public class EcrMakeDetail {
         this.status = status;
     }
 
+    public String getEmd_ifzhix() {
+        return emd_ifzhix;
+    }
+
+    public void setEmd_ifzhix(String emd_ifzhix) {
+        this.emd_ifzhix = emd_ifzhix;
+    }
+
+    public String getEmd_controlpoint() {
+        return emd_controlpoint;
+    }
+
+    public void setEmd_controlpoint(String emd_controlpoint) {
+        this.emd_controlpoint = emd_controlpoint;
+    }
+
     public String getEmd_detno() {
         return emd_detno;
     }
@@ -103,6 +125,94 @@ public class EcrMakeDetail {
         this.emd_detno = emd_detno;
     }
 
+    public String getRmk2() {
+        return rmk2;
+    }
+
+    public void setRmk2(String rmk2) {
+        this.rmk2 = rmk2;
+    }
+
+    public String getRmk3() {
+        return rmk3;
+    }
+
+    public void setRmk3(String rmk3) {
+        this.rmk3 = rmk3;
+    }
+
+    public String getRmk4() {
+        return rmk4;
+    }
+
+    public void setRmk4(String rmk4) {
+        this.rmk4 = rmk4;
+    }
+
+    public String getRmk5() {
+        return rmk5;
+    }
+
+    public void setRmk5(String rmk5) {
+        this.rmk5 = rmk5;
+    }
+
+    public String getEcrd_type() {
+        return ecrd_type;
+    }
+
+    public void setEcrd_type(String ecrd_type) {
+        this.ecrd_type = ecrd_type;
+    }
+
+    public String getEcrd_soncode() {
+        return ecrd_soncode;
+    }
+
+    public void setEcrd_soncode(String ecrd_soncode) {
+        this.ecrd_soncode = ecrd_soncode;
+    }
+
+    public Double getEcrd_newbaseqty() {
+        return ecrd_newbaseqty;
+    }
+
+    public void setEcrd_newbaseqty(Double ecrd_newbaseqty) {
+        this.ecrd_newbaseqty = ecrd_newbaseqty;
+    }
+
+    public String getEcrd_repcode() {
+        return ecrd_repcode;
+    }
+
+    public void setEcrd_repcode(String ecrd_repcode) {
+        this.ecrd_repcode = ecrd_repcode;
+    }
+
+    public Double getEcrd_oldbaseqty() {
+        return ecrd_oldbaseqty;
+    }
+
+    public void setEcrd_oldbaseqty(Double ecrd_oldbaseqty) {
+        this.ecrd_oldbaseqty = ecrd_oldbaseqty;
+    }
+
+    public String getEcrd_location() {
+        return ecrd_location;
+    }
+
+    public void setEcrd_location(String ecrd_location) {
+        this.ecrd_location = ecrd_location;
+    }
+
+    public String getEcrd_oldlocation() {
+        return ecrd_oldlocation;
+    }
+
+    public void setEcrd_oldlocation(String ecrd_oldlocation) {
+        this.ecrd_oldlocation = ecrd_oldlocation;
+    }
+
     public String getMesUser() {
         return mesUser;
     }

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

@@ -217,11 +217,14 @@ public class ERPServiceImpl implements ERPService {
         for (Map<Object, Object> store:maps) {
             String s = store.get("STATUS") == null ? "" : store.get("STATUS").toString();
             String status = "AUDITED".equals(s) ? "已审核" : "COMMITED".equals(s) ? "已提交" : "已删除";
-            EcrMakeDetail ecrMakeDetail = baseDao.getJdbcTemplate().queryForObject("select ecr_code,emd_macode,ecr_tempg,ecr_tempb,ecr_tempc,'" + status + "' status,case when nvl(emd_ifzhix,0)=0 then '否' else '是' end emd_ifzhix,emd_controlpoint,emd_detno||'' emd_detno from ecrmakedetail left join ecr on ecr_id=emd_ecrid where emd_id=?",
-                    new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), store.get("ID"));
-            ecrMakeDetail.setMesUser(tokenConfig.get("mesUser"));
-            ecrMakeDetail.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
-            ecrMakeDetails.add(ecrMakeDetail);
+            SqlRowList rs = baseDao.queryForRowSet("select ecrd_id,emd_id from ecr left join ecrmakedetail on emd_ecrid=ecr_id left join ecrdetail on ecrd_ecrid=ecr_id and emd_maprodcode=ecrd_mothercode where emd_id=" + store.get("ID"));
+            while (rs.next()){
+                EcrMakeDetail ecrMakeDetail = baseDao.getJdbcTemplate().queryForObject("select ecr_code,emd_macode,ecr_tempg,ecr_tempb,ecr_tempc,'" + status + "' status,case when nvl(emd_ifzhix,0)=0 then '否' else '是' end emd_ifzhix,emd_controlpoint,emd_detno||'' emd_detno," +
+                                "'' rmk2,'' rmk3,'' rmk4,'' rmk5,ecrd_type,ecrd_soncode,ecrd_newbaseqty,ecrd_repcode,ecrd_oldbaseqty,ecrd_location,ecrd_oldlocation,'"+tokenConfig.get("mesUser")+"' mesUser,'"+MD5Util.encodeByMD5(tokenConfig.get("mesPwd"))+"' mesPwd " +
+                                "from ecr left join ecrmakedetail on emd_ecrid=ecr_id left join ecrdetail on ecrd_ecrid=ecr_id and emd_maprodcode=ecrd_mothercode where emd_id=? and ecrd_id=?",
+                        new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), rs.getGeneralInt("emd_id"),rs.getGeneralInt("ecrd_id"));
+                ecrMakeDetails.add(ecrMakeDetail);
+            }
         }
         ma.put("Data",ecrMakeDetails);
         Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(ma, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("updateChangeOrderByErp"));