【功能完善】【设计评审单增加客户单据号（HW）】

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

@@ -27,7 +27,7 @@ public class EcrMakeDetail {
     @JSONField(name = "rmk1")
     private String emd_detno;
     @JSONField(name = "rmk2")
-    private String rmk2;
+    private String ecr_tempa;
     @JSONField(name = "rmk3")
     private String rmk3;
     @JSONField(name = "rmk4")
@@ -125,12 +125,12 @@ public class EcrMakeDetail {
         this.emd_detno = emd_detno;
     }
 
-    public String getRmk2() {
-        return rmk2;
+    public String getEcr_tempa() {
+        return ecr_tempa;
     }
 
-    public void setRmk2(String rmk2) {
-        this.rmk2 = rmk2;
+    public void setEcr_tempa(String ecr_tempa) {
+        this.ecr_tempa = ecr_tempa;
     }
 
     public String getRmk3() {

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

@@ -231,7 +231,7 @@ public class ERPServiceImpl implements ERPService {
                             return hashMap;
                         }
                         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,nvl(ecrd_newbaseqty,0) ecrd_newbaseqty,ecrd_repcode,nvl(ecrd_oldbaseqty,0) ecrd_oldbaseqty,ecrd_location,ecrd_oldlocation,'" + tokenConfig.get("mesUser") + "' mesUser,'" + MD5Util.encodeByMD5(tokenConfig.get("mesPwd")) + "' mesPwd " +
+                                        "ecr_tempa,'' rmk3,'' rmk4,'' rmk5,ecrd_type,ecrd_soncode,nvl(ecrd_newbaseqty,0) ecrd_newbaseqty,ecrd_repcode,nvl(ecrd_oldbaseqty,0) 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);
@@ -243,7 +243,7 @@ public class ERPServiceImpl implements ERPService {
                         return hashMap;
                     }
                     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,0 ecrd_newbaseqty,'' ecrd_repcode,0 ecrd_oldbaseqty,'' ecrd_location,'' ecrd_oldlocation,'" + tokenConfig.get("mesUser") + "' mesUser,'" + MD5Util.encodeByMD5(tokenConfig.get("mesPwd")) + "' mesPwd " +
+                                    "ecr_tempa,'' rmk3,'' rmk4,'' rmk5,'' ecrd_type,'' ecrd_soncode,0 ecrd_newbaseqty,'' ecrd_repcode,0 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 where emd_id=?",
                             new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), store.get("ID"));
                     ecrMakeDetails.add(ecrMakeDetail);