diff --git a/lms/nladmin-system/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/src/main/java/org/nl/start/Init.java index a6a2cab..3a10572 100644 --- a/lms/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/lms/nladmin-system/src/main/java/org/nl/start/Init.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class Init implements ApplicationRunner { + @Override public void run(ApplicationArguments args) throws Exception { System.out.println("项目启动成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index aac3f16..6884c31 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -16,7 +16,7 @@ import org.springframework.http.HttpStatus; public class AcsUtil { public static JSONObject notifyAcs(String api, JSONArray list) { //判断是否连接ACS系统 - String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue(); + String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_connect_acs").getValue(); JSONObject result = new JSONObject(); if (StrUtil.equals("0", isConnect)) { result.put("status", HttpStatus.OK.value()); @@ -26,7 +26,7 @@ public class AcsUtil { } //ACS地址：127.0.0.1:8010 - String acsUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("ACS_URL").getValue(); + String acsUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("acs_url").getValue(); String url = acsUrl + api; try { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java index 7f39272..82afb2c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java @@ -71,7 +71,7 @@ public class CallMaterialTask extends AbstractAcsTask { WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("point_code1") + "'").uniqueResult(0); - startPointObj.put("lock_type", "00"); + startPointObj.put("lock_type", "1"); startPointObj.put("point_status", "00"); startPointObj.put("vehicle_code", ""); startPointObj.put("vehicle_type", ""); @@ -109,7 +109,7 @@ public class CallMaterialTask extends AbstractAcsTask { ProcedureIOStable.update(IosObj); //终点加锁 HashMap lock_map = new HashMap(); - lock_map.put("lock_type", "01"); + lock_map.put("lock_type", "2"); WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'"); //修改任务状态 taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); @@ -185,7 +185,7 @@ public class CallMaterialTask extends AbstractAcsTask { //起点点加锁 WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); JSONObject startPointObj = pointTable.query("point_code='" + point_code1 + "'").uniqueResult(0); - startPointObj.put("lock_type", "01"); + startPointObj.put("lock_type", "2"); pointTable.update(startPointObj); JSONObject taskObj = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java index 14e5ce2..32f0cd3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java @@ -64,7 +64,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { if (StrUtil.equals("DPJQB01", endPoint.getString("region_code"))) { //解锁起点 JSONObject startPoint = new JSONObject(); - startPoint.put("lock_type", "00"); + startPoint.put("lock_type", "1"); startPoint.put("point_status", "1"); startPoint.put("update_time", DateUtil.now()); pointTab.update(startPoint, "point_code = '" + start_point_code + "'"); @@ -79,7 +79,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { JSONObject startPoint = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0); Integer vehicle_qty = startPoint.getInteger("vehicle_qty"); int after_qty=vehicle_qty-1; - startPoint.put("lock_type", "00"); + startPoint.put("lock_type", "1"); startPoint.put("vehicle_qty", after_qty); if (after_qty>0){ startPoint.put("point_status", "2"); @@ -116,7 +116,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { taskTab.update(jsonTask); //锁住点位 - dpjPoint.put("lock_type", "01"); + dpjPoint.put("lock_type", "2"); pointTab.update(dpjPoint); } else { //查找叠盘架编码 @@ -153,7 +153,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { taskTab.insert(param); //锁住起点 - outJsonObj.put("lock_type", "01"); + outJsonObj.put("lock_type", "2"); pointTab.update(outJsonObj); this.renotifyAcs(String.valueOf(task_id)); @@ -166,7 +166,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { taskTab.update(jsonTask); //锁住点位 - dpjPoint1.put("lock_type", "01"); + dpjPoint1.put("lock_type", "2"); pointTab.update(outJsonObj); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java index 3cabc3c..a98af3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java @@ -97,7 +97,7 @@ public class SendMaterialTask extends AbstractAcsTask { String vehicle_code = jsonTask.getString("vehicle_code"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("point_code2") + "'").uniqueResult(0); - endpointObj.put("lock_type", "00"); + endpointObj.put("lock_type", "1"); endpointObj.put("point_status", "02"); endpointObj.put("vehicle_code", vehicle_code); endpointObj.put("vehicle_type", jsonTask.getString("vehicle_type")); @@ -105,7 +105,7 @@ public class SendMaterialTask extends AbstractAcsTask { taskTab.update(jsonTask); /* JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("point_code1") + "'").uniqueResult(0); - startPointObj.put("lock_type", "00"); + startPointObj.put("lock_type", "1"); startPointObj.put("point_status", "00"); startPointObj.put("vehicle_code", ""); pointTab.update(startPointObj); @@ -143,7 +143,7 @@ public class SendMaterialTask extends AbstractAcsTask { ProcedureIOStable.update(IosObj); //终点加锁 HashMap lock_map = new HashMap(); - lock_map.put("lock_type", "01"); + lock_map.put("lock_type", "2"); WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'"); //修改任务状态 taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); @@ -190,7 +190,7 @@ public class SendMaterialTask extends AbstractAcsTask { //终点点加锁 WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); JSONObject endPointObj = pointTable.query("point_code='" + point_code2 + "'").uniqueResult(0); - endPointObj.put("lock_type", "01"); + endPointObj.put("lock_type", "2"); pointTable.update(endPointObj); // 创建任务 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java index 7368b38..49c1911 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java @@ -60,13 +60,13 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { if (StrUtil.equals("DPJQB01", endPoint.getString("region_code"))) { Integer vehicle_qty = endPoint.getInteger("vehicle_qty"); vehicle_qty += jsonTask.getInteger("vehicle_qty"); - endPoint.put("lock_type", "00"); + endPoint.put("lock_type", "1"); endPoint.put("vehicle_qty", vehicle_qty); endPoint.put("point_status", "1"); endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); pointTab.update(endPoint); } else {//非叠盘架 - endPoint.put("lock_type", "00"); + endPoint.put("lock_type", "1"); endPoint.put("vehicle_qty", jsonTask.getString("vehicle_qty")); endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); endPoint.put("point_status", "1"); @@ -157,7 +157,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { } //锁住终点 JSONObject pointObj = new JSONObject(); - pointObj.put("lock_type", "01"); + pointObj.put("lock_type", "2"); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj, "point_code ='" + jsonTask.getString("point_code2") + "'"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 2640257..6eddd5f 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ