From 2bffb17dae930c35674f09cae326872657282ccf Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Tue, 23 Aug 2022 11:29:54 +0800 Subject: [PATCH] no message --- .../acs/service/impl/WmsToJnServiceImpl.java | 72 +++++++++++-------- .../wms/sch/manage/buss/SendMaterialTask.java | 3 +- .../wms/sch/manage/buss/ToConveyorTask.java | 3 +- .../src/main/resources/WmsToJn.xml | 28 ++++++++ .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 2 + 6 files changed, 79 insertions(+), 31 deletions(-) create mode 100644 wms/hd/nladmin-system/src/main/resources/WmsToJn.xml diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index 4c95f00..155c9b9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -25,21 +25,26 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j public class WmsToJnServiceImpl implements WmsToJnService { - private String URL = "192.168.23.32"; + private String URL = "http://61.177.143.218:8888/ZQ_ZLGL_JsonFacade/ZQJT/MES/MES_ProductionFacade.asmx"; final static int timeout = 3000; @Override public Map synchroDaySchedule(Map whereJson) { + String methon = "/getshoporder"; String today = DateUtil.today(); //同步日计划 JSONObject obj = new JSONObject(); obj.put("startdate", whereJson.get("startdate")); obj.put("enddate", whereJson.get("enddate")); - String resultMsg = HttpRequest.post(URL) + obj.put("ticker", "WLXT"); + log.info("诺力请求同步嘉耐mes物料入参为{}", obj.toString()); + + String resultMsg = HttpRequest.post(URL + methon) .body(String.valueOf(obj)).timeout(timeout) .execute().body(); JSONObject result = JSONObject.parseObject(resultMsg); + log.info("诺力请求同步嘉耐mes物料出参为{}", resultMsg); String status = result.getString("status"); if (StrUtil.isNotEmpty(status) && status.equals("1")) { log.info("wms同步嘉耐工单成功！"); @@ -96,7 +101,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { @Override @Transactional(rollbackFor = Exception.class) public Map synchroMaterial(Map whereJson) { - String methon = "getItems"; + String methon = "/getItems"; /** * DM: "物料代码", * NAME: "物料名称", @@ -108,9 +113,13 @@ public class WmsToJnServiceImpl implements WmsToJnService { */ WQLObject material_table = WQLObject.getWQLObject("MD_ME_Material"); JSONObject obj = new JSONObject(); - String resultMsg = HttpRequest.post(URL) + obj.put("ticker", "WLXT"); + log.info("诺力请求同步嘉耐mes物料入参为{}", obj.toString()); + String resultMsg = HttpRequest.post(URL + methon) .body(String.valueOf(obj)).timeout(timeout) .execute().body(); + + log.info("诺力请求同步嘉耐mes物料出参为{}", resultMsg); JSONObject result = JSONObject.parseObject(resultMsg); String status = result.getString("status"); if (StrUtil.isNotEmpty(status) && status.equals("1")) { @@ -121,48 +130,55 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONArray Table = new JSONArray(); JSONObject param = new JSONObject(); - JSONArray materialarr = result.getJSONArray("Table"); + JSONArray materialarr = result.getJSONObject("returnData").getJSONArray("Table"); for (int i = 0; i < materialarr.size(); i++) { JSONObject materialjo = materialarr.getJSONObject(i); String DM = materialjo.getString("DM"); param.put("ITEMCODE", DM); Table.add(param); - JSONObject materialObj = material_table.query("material_code='" + DM + "'").uniqueResult(0); + JSONObject material_jo = material_table.query("material_code='" + DM + "'").uniqueResult(0); //如果有就更新，没有就插入 - if (ObjectUtil.isEmpty(materialObj)) { - materialObj.put("material_name", materialjo.getString("NAME")); - materialObj.put("material_spec", materialjo.getString("GG")); - materialObj.put("material_model", materialjo.getString("GG")); - materialObj.put("english_name", materialjo.getString("NAME")); - materialObj.put("stewing_time", materialjo.getString("WAITTIME")); - materialObj.put("print_model", materialjo.getString("PRINTTYPE")); - materialObj.put("is_auto_package", materialjo.getString("ISAUTO")); - materialObj.put("is_used", "1"); - materialObj.put("update_optid", SecurityUtils.getCurrentUserId()); - materialObj.put("update_optname", SecurityUtils.getNickName()); - materialObj.put("update_time", DateUtil.now()); - material_table.update(materialObj); + if (ObjectUtil.isNotEmpty(material_jo)) { + String stewing_time = "0"; + if (StrUtil.isNotEmpty(materialjo.getString("WAITTIME"))) { + stewing_time = materialjo.getString("WAITTIME"); + } + material_jo.put("material_name", materialjo.getString("NAME")); + material_jo.put("material_spec", materialjo.getString("GG")); + material_jo.put("material_model", materialjo.getString("GG")); + material_jo.put("english_name", materialjo.getString("NAME")); + material_jo.put("stewing_time", stewing_time); + material_jo.put("print_model", materialjo.getString("PRINTTYPE")); + material_jo.put("is_auto_package", materialjo.getString("ISAUTO")); + material_jo.put("is_used", "1"); + material_jo.put("update_optid", "1"); + material_jo.put("update_optname", "管理员"); + material_jo.put("update_time", DateUtil.now()); + material_table.update(material_jo); } else { + String stewing_time = "0"; + if (StrUtil.isNotEmpty(materialjo.getString("WAITTIME"))) { + stewing_time = materialjo.getString("WAITTIME"); + } + JSONObject materialObj = new JSONObject(); materialObj.put("material_id", IdUtil.getSnowflake(1, 1).nextId()); materialObj.put("material_name", materialjo.getString("NAME")); - materialObj.put("material_code", materialjo.getString("GG")); + materialObj.put("material_code", materialjo.getString("DM")); materialObj.put("material_model", materialjo.getString("GG")); materialObj.put("english_name", materialjo.getString("NAME")); + materialObj.put("stewing_time", stewing_time); materialObj.put("print_model", materialjo.getString("PRINTTYPE")); materialObj.put("is_auto_package", materialjo.getString("ISAUTO")); materialObj.put("is_used", "1"); - materialObj.put("create_id", SecurityUtils.getCurrentUserId()); - materialObj.put("create_name", SecurityUtils.getNickName()); + materialObj.put("create_id", "1"); + materialObj.put("create_name", "管理员"); materialObj.put("create_time", DateUtil.now()); - materialObj.put("update_optid", SecurityUtils.getCurrentUserId()); - materialObj.put("update_optname", SecurityUtils.getNickName()); - materialObj.put("update_time", DateUtil.now()); material_table.insert(materialObj); } } //调用接口告诉wms 调用已经同步该物料 - String returnResultMsg = HttpRequest.post(URL) + /* String returnResultMsg = HttpRequest.post(URL) .body(String.valueOf(obj)).timeout(timeout) .execute().body(); JSONObject returnResult = JSONObject.parseObject(returnResultMsg); @@ -171,7 +187,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { log.info("wms反馈嘉耐物料成功！"); } else { log.info("wms反馈嘉耐物料失败！"); - } + }*/ JSONObject returnjo = new JSONObject(); returnjo.put("status", HttpStatus.OK.value()); returnjo.put("message", "任务状态反馈成功!"); @@ -224,7 +240,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { public Map feedBackPackage(Map whereJson) { //木托盘号码 String vehicle_code = (String) whereJson.get("vehicle_code"); - if (StrUtil.isEmpty(vehicle_code)){ + if (StrUtil.isEmpty(vehicle_code)) { throw new BadRequestException("托盘编码不能为空！"); } return null; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java index a30cfbf..d726352 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java @@ -53,7 +53,7 @@ public class SendMaterialTask extends AbstractAcsTask { //更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", car_no); + taskTab.update(jsonTask); HashMap map = new HashMap(); map.put("update_optid", SecurityUtils.getCurrentUserId()); @@ -68,6 +68,7 @@ public class SendMaterialTask extends AbstractAcsTask { jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("update_time", DateUtil.now()); + jsonTask.put("car_no", car_no); jsonTask.put("remark", "任务执行完成"); ///审核单据 增加库存 改变出入库表的状态 WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java index f4b3fa6..8e7a147 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java @@ -53,7 +53,7 @@ public class ToConveyorTask extends AbstractAcsTask { if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { //更新任务状态为执行中 jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("car_no", car_no); + jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); HashMap map = new HashMap(); @@ -66,6 +66,7 @@ public class ToConveyorTask extends AbstractAcsTask { if (TaskStatusEnum.FINISHED.getCode().equals(status)) { // 更新任务状态为完成 + jsonTask.put("car_no", car_no); jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("update_time", DateUtil.now()); diff --git a/wms/hd/nladmin-system/src/main/resources/WmsToJn.xml b/wms/hd/nladmin-system/src/main/resources/WmsToJn.xml new file mode 100644 index 0000000..7a209ee --- /dev/null +++ b/wms/hd/nladmin-system/src/main/resources/WmsToJn.xml @@ -0,0 +1,28 @@ + + + + + + + + + ${LOG_HOME}/wmstojn/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + + + + + diff --git a/wms/hd/nladmin-system/src/main/resources/config/application.yml b/wms/hd/nladmin-system/src/main/resources/config/application.yml index 1fca0b8..c7ad90c 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application.yml @@ -43,7 +43,7 @@ rsa: private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== logging: file: - path: C:\logs\nlacs\ + path: C:\logs\wms\ demo: monitor: server-url: https://www.demo-monitor.com diff --git a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml index 3a25bd7..46a3bf8 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -17,6 +17,8 @@ https://juejin.cn/post/6844903775631572999 + +