设计变更评审单上传MES

src/main/java/com/uas/eis/controller/ERPController.java

@@ -85,4 +85,9 @@ public class ERPController {
         return erpService.checkProdBomItem(data);
     }
 
+    @RequestMapping("/erp/updateChangeOrderByErp")
+    public Map<String, Object> updateChangeOrderByErp(String data){
+        return erpService.updateChangeOrderByErp(data);
+    }
+
 }

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

@@ -0,0 +1,121 @@
+package com.uas.eis.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * @author koul
+ * @email koul@usoftchina.com
+ * @date 2023-09-19 08:55
+ */
+public class EcrMakeDetail {
+    @JSONField(name = "journalNo")
+    private String ecr_code;
+    @JSONField(name = "prodNo")
+    private String emd_macode;
+    @JSONField(name = "type1")
+    private String ecr_tempg;
+    @JSONField(name = "changeContent")
+    private String ecr_tempb;
+    @JSONField(name = "changeContent2")
+    private String ecr_tempc;
+    @JSONField(name = "status")
+    private String status;
+    @JSONField(name = "mustFlag")
+    private String emd_ifzhix;
+    @JSONField(name = "location")
+    private String emd_controlpoint;
+    @JSONField(name = "rmk1")
+    private String emd_detno;
+    @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;
+    }
+
+    public void setEcr_code(String ecr_code) {
+        this.ecr_code = ecr_code;
+    }
+
+    public String getEmd_macode() {
+        return emd_macode;
+    }
+
+    public void setEmd_macode(String emd_macode) {
+        this.emd_macode = emd_macode;
+    }
+
+    public String getEcr_tempg() {
+        return ecr_tempg;
+    }
+
+    public void setEcr_tempg(String ecr_tempg) {
+        this.ecr_tempg = ecr_tempg;
+    }
+
+    public String getEcr_tempb() {
+        return ecr_tempb;
+    }
+
+    public void setEcr_tempb(String ecr_tempb) {
+        this.ecr_tempb = ecr_tempb;
+    }
+
+    public String getEcr_tempc() {
+        return ecr_tempc;
+    }
+
+    public void setEcr_tempc(String ecr_tempc) {
+        this.ecr_tempc = ecr_tempc;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getEmd_detno() {
+        return emd_detno;
+    }
+
+    public void setEmd_detno(String emd_detno) {
+        this.emd_detno = emd_detno;
+    }
+
+    public String getMesUser() {
+        return mesUser;
+    }
+
+    public void setMesUser(String mesUser) {
+        this.mesUser = mesUser;
+    }
+
+    public String getMesPwd() {
+        return mesPwd;
+    }
+
+    public void setMesPwd(String mesPwd) {
+        this.mesPwd = mesPwd;
+    }
+}

src/main/java/com/uas/eis/service/ERPService.java

@@ -31,4 +31,6 @@ public interface ERPService {
      */
     Map<String, Object> checkProdBomItem(String data);
 
+    Map<String, Object> updateChangeOrderByErp(String data);
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -190,6 +191,31 @@ public class ERPServiceImpl implements ERPService {
         return hashMap;
     }
 
+    @Override
+    public Map<String, Object> updateChangeOrderByErp(String data) {
+        Map<String, Object> hashMap = new HashMap<>();
+        hashMap.put("code", 0);
+        hashMap.put("msg", "参数异常，请联系管理员！");
+        List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+        List<EcrMakeDetail> ecrMakeDetails = new ArrayList<>();
+        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||'' 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);
+        }
+        Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(ecrMakeDetails, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("updateChangeOrderByErp"));
+        if (map != null) {
+            int msgId = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
+            hashMap.put("code", msgId);
+            hashMap.put("msg", map.get("msg"));
+        }
+        return hashMap;
+    }
+
     private ApiResult<String> syncMES(String params,String url) {
         try {
             logger.info("params：" + params);

src/main/resources/api_sign_key_mapping.properties

@@ -8,4 +8,5 @@ syncMakeBaseDetail=updateProdBomByErp
 syncUpdateReceiveByErp=updateReceiveByErp
 syncProdInOutMakeGive=updateProdFeedBomByErp
 syncCustomer=webEditCustomer
-syncMakeMaterialCheck=checkProdBomItem
+syncMakeMaterialCheck=checkProdBomItem
+updateChangeOrderByErp=updateChangeOrderByErp