From 596843c34bfad0267819584b19458807a995f8e4 Mon Sep 17 00:00:00 2001 From: loujf Date: Wed, 9 Nov 2022 22:09:31 +0800 Subject: [PATCH] =?UTF-8?q?mes=E4=BA=A4=E4=BA=92=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialServiceImpl.java | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 5 +- .../acs/service/impl/WmsToJnServiceImpl.java | 93 ++++++++++--------- .../org/nl/wms/ext/acs/wql/WMSTOJN_001.wql | 10 +- .../wms/sch/manage/buss/CallMaterialTask.java | 4 +- .../wms/sch/manage/buss/SendMaterialTask.java | 6 +- .../wms/sch/manage/buss/ToConveyorTask.java | 7 +- 7 files changed, 72 insertions(+), 55 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java index a4374a9..d3738fc 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java @@ -57,7 +57,7 @@ public class MaterialServiceImpl implements MaterialService { //将静置时间从分钟改为小时 for (int i = 0; i < content.size(); i++) { JSONObject jo = (JSONObject) content.get(i); - Integer stewing_time = jo.getInteger("stewing_time"); + Double stewing_time = jo.getDouble("stewing_time"); String vehicle_type = vehicleService.getVehicleType(jo.getString("vehicle_type")); jo.put("vehicle_type",vehicle_type); if (stewing_time != 0) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 767d41c..1725298 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -153,7 +153,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String record_id = PressureUtil.record(joo); //回传不合格记录 // Wms/api/produceTaskToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - // wmsToJnService.feedBackQualityInfo(record_id); + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackQualityInfo(record_id); } break; } @@ -200,7 +201,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String record_id = PressureUtil.record(joo); //回传不合格记录 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - // wmsToJnService.feedBackQualityInfo(record_id); + wmsToJnService.feedBackQualityInfo(record_id); } break; 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 c7c896f..59e9815 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 @@ -83,19 +83,18 @@ public class WmsToJnServiceImpl implements WmsToJnService { jo.put("producetask_status", "01"); jo.put("material_id", materialObj.getString("material_id")); jo.put("device_id", deviceObj.getString("device_id")); - jo.put("plan_qty", deviceObj.getString("REQQTY")); - jo.put("vehicle_type", deviceObj.getString("STOCKTYPE")); - jo.put("plan_date", deviceObj.getString("PLANSTARTDATE")); - jo.put("classes", deviceObj.getString("BANCI")); - jo.put("ext_shoporder_no", deviceObj.getString("SHOPORDERNO")); - jo.put("print_type", deviceObj.getString("PRINTTYPE")); - jo.put("print_dm", deviceObj.getString("PRINTDM")); - jo.put("print_name", deviceObj.getString("PRINTNAME")); - jo.put("print_gg", deviceObj.getString("PRINTGG")); - jo.put("print_pc", deviceObj.getString("PRINTPC")); - jo.put("yh_name", deviceObj.getString("YHNAME")); + jo.put("plan_qty", dayScheduleObj.getString("REQQTY")); + jo.put("vehicle_type", dayScheduleObj.getString("STOCKTYPE")); + jo.put("plan_date", dayScheduleObj.getString("PLANSTARTDATE")); + jo.put("classes", dayScheduleObj.getString("BANCI")); + jo.put("ext_shoporder_no", dayScheduleObj.getString("SHOPORDERNO")); + jo.put("print_type", dayScheduleObj.getString("PRINTTYPE")); + jo.put("print_dm", dayScheduleObj.getString("PRINTDM")); + jo.put("print_name", dayScheduleObj.getString("PRINTNAME")); + jo.put("print_gg", dayScheduleObj.getString("PRINTGG")); + jo.put("print_pc", dayScheduleObj.getString("PRINTPC")); + jo.put("yh_name", dayScheduleObj.getString("YHNAME")); jo.put("is_export", "1"); - jo.put("vehicle_type", deviceObj.getString("STOCKTYPE")); jo.put("create_id", "1"); jo.put("create_name", "管理员"); jo.put("create_time", DateUtil.now()); @@ -160,7 +159,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { } 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("material_model", materialjo.getString("STOCKTYPE")); material_jo.put("english_name", materialjo.getString("NAME")); material_jo.put("stewing_time", stewing_time); material_jo.put("print_model", materialjo.getString("PRINTTYPE")); @@ -193,9 +192,9 @@ public class WmsToJnServiceImpl implements WmsToJnService { material_table.insert(materialObj); } //反馈嘉耐已经同步了该物料 - /* HashMap map = new HashMap(); + HashMap map = new HashMap(); map.put("material_code", materialjo.getString("DM")); - this.feedMaterial(map);*/ + this.feedMaterial(map); } @@ -211,10 +210,10 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "setItems"; + String method = "/setItems"; JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", JSONObject.toJSON(whereJson)); + obj.put("stringData", JSONObject.toJSON(whereJson).toString()); log.info("诺力请求嘉耐反馈物料同步入参{}", obj.toString()); String resultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -222,11 +221,11 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject result = JSONObject.parseObject(resultMsg); log.info("诺力请求嘉耐反馈物料同步出参{}", resultMsg); //调用接口告诉wms 调用已经同步该物料 - String returnResultMsg = HttpRequest.post(URL) - .body(String.valueOf(obj)).timeout(timeout) - .execute().body(); - JSONObject returnResult = JSONObject.parseObject(returnResultMsg); - String returnStatus = returnResult.getString("status"); +// String returnResultMsg = HttpRequest.post(URL) +// .body(String.valueOf(obj)).timeout(timeout) +// .execute().body(); +// JSONObject returnResult = JSONObject.parseObject(returnResultMsg); + String returnStatus = result.getString("status"); if (StrUtil.isNotEmpty(returnStatus) && returnStatus.equals("1")) { log.info("wms反馈嘉耐物料成功！"); } else { @@ -245,7 +244,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { return null; } JSONArray results = WQL.getWO("WMSTOJN_001").addParam("flag", "7").process().getResultJSONArray(0); - String method = "upDEVStatus"; + String method = "/upDEVStatus"; for (int i = 0; i < results.size(); i++) { JSONObject param = results.getJSONObject(0); JSONObject obj = new JSONObject(); @@ -264,6 +263,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -284,12 +284,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "InsertPressInfo"; + String method = "/InsertPressInfo"; String task_id = (String) whereJson.get("task_id"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "1").addParam("task_id", task_id).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐回传搬运记录入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -303,6 +303,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -318,12 +319,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "InKiln"; + String method = "/InKiln"; String vehicle_code = (String) whereJson.get("vehicle_code"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "2").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐回传入窑信息入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(jsonObject)).timeout(timeout) @@ -337,6 +338,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -354,10 +356,10 @@ public class WmsToJnServiceImpl implements WmsToJnService { } String vehicle_code = (String) whereJson.get("vehicle_code"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "3").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); - String method = "OutKiln"; + String method = "/OutKiln"; JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐回传出窑信息入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(jsonObject)).timeout(timeout) @@ -371,6 +373,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -394,10 +397,10 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject mstObj = WQL.getWO("WMSTOJN_001").addParam("flag", "9").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); JSONArray dtlarr = WQL.getWO("WMSTOJN_001").addParam("flag", "8").addParam("record_id", mstObj.getString("record_id")).process().getResultJSONArray(0); mstObj.put("DETAILS", dtlarr); - String method = ""; + String method = "/Packing"; JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", mstObj); + obj.put("stringData", mstObj.toString()); log.info("诺力请求嘉耐回传组盘记录入参{}", obj.toString()); String resultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -411,6 +414,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -432,10 +436,10 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (ObjectUtil.isEmpty(recordObj)) { throw new BadRequestException("未找到记录标识为'" + record_id + "'的记录"); } - String method = "InsertQualityInfo"; + String method = "/InsertQualityInfo"; JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", recordObj); + obj.put("stringData", recordObj.toString()); log.info("诺力请求嘉耐回传不合格记录入参{}", obj.toString()); String resultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -451,6 +455,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -469,7 +474,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.isEmpty(device_code)) { throw new BadRequestException("设备编码不能为空！"); } - String method = "getPressWorkShop"; + String method = "/getPressWorkShop"; JSONObject obj = new JSONObject(); obj.put("ticker", "Sbdm"); obj.put("device_code", device_code); @@ -497,12 +502,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "InWait"; + String method = "/InWait"; String task_id = (String) whereJson.get("task_id"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "10").addParam("task_id", task_id).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐反馈入冷却缓冲区入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -516,6 +521,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -531,12 +537,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "outWait"; + String method = "/outWait"; String task_id = (String) whereJson.get("task_id"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "11").addParam("task_id", task_id).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐反馈出冷却缓冲区入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -550,6 +556,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -565,12 +572,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "InPartStock"; + String method = "/InPartStock"; String task_id = (String) whereJson.get("task_id"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "12").addParam("task_id", task_id).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐反馈半木托入临时库区入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -584,6 +591,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); @@ -599,12 +607,12 @@ public class WmsToJnServiceImpl implements WmsToJnService { if (StrUtil.equals(value, "0")) { return null; } - String method = "outWait"; + String method = "/outWait"; String task_id = (String) whereJson.get("task_id"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "13").addParam("task_id", task_id).process().uniqueResult(0); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); - obj.put("stringData", jsonObject); + obj.put("stringData", jsonObject.toString()); log.info("诺力请求嘉耐反馈半木托出临时库区入参{}", obj.toString()); String returnResultMsg = HttpRequest.post(URL + method) .body(String.valueOf(obj)).timeout(timeout) @@ -618,6 +626,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { JSONObject jo = new JSONObject(); jo.put("record_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("method", method); + jo.put("status", "2"); jo.put("content", obj); jo.put("create_time", DateUtil.now()); wo.insert(jo); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql index 843f73b..85da0d4 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql @@ -58,6 +58,8 @@ LEFT JOIN sch_base_point point ON point.point_code = task.start_point_code LEFT JOIN pdm_base_device device ON device.device_id = point.device_id LEFT JOIN pdm_mg_producetask producetask ON producetask.producetask_id = vehicle_group.producetask_id + WHERE + 1=1 OPTION 输入.task_id <> "" task.task_id = 输入.task_id ENDOPTION @@ -75,6 +77,8 @@ FROM pdm_bi_kilnrecord kiln LEFT JOIN st_buss_vehiclegroup vehicle_group ON kiln.vehicle_code = vehicle_group.vehicle_code + WHERE + 1=1 OPTION 输入.vehicle_code <> "" kiln.vehicle_code = 输入.vehicle_code ENDOPTION @@ -91,6 +95,8 @@ FROM pdm_bi_kilnrecord kiln LEFT JOIN st_buss_vehiclegroup vehicle_group ON kiln.vehicle_code = vehicle_group.vehicle_code + WHERE + 1=1 OPTION 输入.vehicle_code <> "" kiln.vehicle_code = 输入.vehicle_code ENDOPTION @@ -154,6 +160,8 @@ IF 输入.flag = "5" "" AS BZ FROM st_buss_deviceStatus deviceStatus + WHERE + 1=1 ENDSELECT ENDQUERY ENDIF @@ -207,7 +215,7 @@ IF 输入.flag = "8" SELECT DISTINCT vehicle_group.material_move_id AS ID, task.update_time AS INWAITDATE, - task.next_point_code AS LOCDESC + task.next_point_code AS WAITLOCDESC FROM sch_base_task task LEFT JOIN st_buss_vehiclegroup vehicle_group ON vehicle_group.vehicle_code = task.vehicle_code diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index 6154274..1c64fef 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -145,10 +145,10 @@ public class CallMaterialTask extends AbstractAcsTask { jo.put("task_id", task_id); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) { - // wmsToJnServiceImpl.feedBackOutWait(jo); + wmsToJnServiceImpl.feedBackOutWait(jo); } if (StrUtil.equals(point_type, AreaEnum.MTPQ.getCode())) { - // wmsToJnServiceImpl.feedBackOutPartStock(jo); + wmsToJnServiceImpl.feedBackOutPartStock(jo); } } 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 7e7622c..8b116b8 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 @@ -130,13 +130,13 @@ public class SendMaterialTask extends AbstractAcsTask { jo.put("task_id", task_id); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); if (StrUtil.equals(point_type,AreaEnum.RYHCHJ.getCode())){ - // wmsToJnServiceImpl.feedBackCarryRecord(jo); + wmsToJnServiceImpl.feedBackCarryRecord(jo); } if (StrUtil.equals(point_type,AreaEnum.CYHCHJ.getCode())){ - // wmsToJnServiceImpl.feedBackInWait(jo); + wmsToJnServiceImpl.feedBackInWait(jo); } if (StrUtil.equals(point_type,AreaEnum.MTPQ.getCode())){ - // wmsToJnServiceImpl.feedBackInPartStock(jo); + wmsToJnServiceImpl.feedBackInPartStock(jo); } } 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 b49ea7e..399ed46 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 @@ -74,11 +74,10 @@ public class ToConveyorTask extends AbstractAcsTask { taskTab.update(jsonTask); //调用接口反馈给嘉耐 搬运任务 - /*JSONObject param = new JSONObject(); + JSONObject param = new JSONObject(); param.put("task_id", task_id); - WmsToJnService wmsToJnService = new WmsToJnServiceImpl(); - wmsToJnService.feedBackCarryRecord(param) - wmsToJnService.feedBackCarryRecord(param);*/ + WmsToJnService wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackCarryRecord(param); } }