root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-20 19:22:08 +08:00
parent 71eefe44d4
commit 8e7d7cc89a
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -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("项目启动成功!");

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -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 {

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java
View File

@@ -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();

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java
View File

@@ -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);
}

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java
View File

@@ -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);
// 创建任务

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java
View File

@@ -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") + "'");
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.