切换生产环境

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

@@ -114,4 +114,13 @@ public class MESController {
     public ApiResult<String> makeCheckOutStock(HttpServletRequest request){
         return mesService.makeCheckOutStock(request);
     }
+    /**
+     * 制造单ECN和ECN变更校验
+     * @param request
+     * @return
+     */
+    @RequestMapping("/mes/makeECNCheck")
+    ApiResult<String> makeECNCheck(HttpServletRequest request) {
+        return mesService.makeECNCheck(request);
+    }
 }

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

@@ -751,6 +751,28 @@ public class MESServiceImpl implements MESService {
 
     }
 
+    @Override
+    public ApiResult<String> makeECNCheck(HttpServletRequest request) {
+        JSONObject jsonData = getJsonData(request);
+        if (jsonData!=null){
+            String makeCode = StringUtil.nvl(jsonData.get("MakeCode"), "");
+            Object mcCode = baseDao.getFieldDataByCondition("makematerialchange", "wm_concat(mc_code)",
+                    "mc_id in (select md_mcid from makematerialchangedet where md_makecode='"+makeCode+"' and nvl(md_didstatus,' ')<>'执行成功')");
+            if (mcCode!=null){
+                return ApiResponse.failRsp("10091",request.getHeader("RequestId"),"ERP有未执行的制造单ECN："+mcCode);
+            }
+            Object ecnCode = baseDao.getFieldDataByCondition("ecn", "wm_concat(ecn_code)",
+                    "nvl(ecn_didstatus,' ')<>'已执行' and ecn_id in (select ed_ecnid from ecndetail left join make on ed_boid=ma_bomid where ma_code='"+makeCode+"')");
+            if (ecnCode!=null){
+                return ApiResponse.failRsp("10092",request.getHeader("RequestId"),"ERP有未执行的ECN："+ecnCode);
+            }
+            return ApiResponse.successRsp("0",request.getHeader("RequestId"),"校验通过！");
+        }else {
+            return ApiResponse.failRsp("10093",request.getHeader("RequestId"),"参数异常！");
+        }
+
+    }
+
     private Map<String, JSONArray> getData(HttpServletRequest request){
         Map<String, JSONArray> map = new HashMap<>();
         try {

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

@@ -75,4 +75,11 @@ public interface MESService {
      * @return
      */
     ApiResult<String> makeCheckOutStock(HttpServletRequest request);
+
+    /**
+     * 制造单ECN和ECN变更校验
+     * @param request
+     * @return
+     */
+    ApiResult<String> makeECNCheck(HttpServletRequest request);
 }

src/main/resources/api_sign_key_mapping.properties

@@ -1,7 +1,7 @@
 BOYT=f9d17c1047fd468081e39ce33bb41bb7
 mesUser=ERP
 mesPwd=erp.com
-mesHttp=http://192.168.16.244:8088/mrs/
+mesHttp=http://192.168.16.114:8080/mrs/
 syncProduct=updateItemByErp
 syncMakeBase=updateProdByErp
 syncMakeBaseDetail=updateProdBomByErp

src/main/resources/application-prod.yml

@@ -9,7 +9,6 @@ spring:
         host: 10.1.81.208
         port: 26379
 server:
-    prot: 8080
     tomcat:
         uri_encoding: UTF-8
     context-path: