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

GX

Browse Source
This commit is contained in:
gengby
2022-11-15 10:25:15 +08:00
parent 503aaeb9fa
commit 3d18aa821f
25 changed files with 531 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.LinkedList;
import java.util.Map;
@@ -302,9 +303,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (StrUtil.equals(is_first, "true")) {
JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0);
redisUtils.set(barcode,ivtJson.getString("material_id"));
redisUtils.set(barcode+"-ivt_qty",ivtJson.getString("ivt_qty"));
materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id"));
}
String material_id = String.valueOf(redisUtils.get(barcode));
String ivt_qty = String.valueOf(redisUtils.get(barcode+"-ivt_qty"));
Long materialId = null;
String point_status = "2";
if (StrUtil.equals("0",barcode)){
@@ -319,6 +322,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
StructivtDto structivtDto = structivtService.findByCode(device_code);
structivtDto.setMaterial_id(materialId);
structivtDto.setVehicle_code(barcode);
structivtDto.setIvt_qty(new BigDecimal(ivt_qty));
VehicleDto vehicleDto = vehicleService.findByCode(barcode);
if (ObjectUtil.isNotEmpty(vehicleDto)) {
structivtDto.setVehicle_type(vehicleDto.getVehicle_type());
@@ -348,12 +352,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
if (ll.size() == (HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) && isHasGoods) {
ll.removeFirst();
materialbaseDto = materialbaseService.findById(ivtJsonObject.getLong("material_id"));
JSONObject map = new JSONObject();
map.put("vehicle_type", ivtJsonObject.getString("vehicle_type"));
map.put("vehicle_code", ivtJsonObject.getString("vehicle_code"));
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
map.put("material_code", materialbaseDto.getMaterial_code());
}
map.put("ivt_qty",ivtJsonObject.getString("ivt_qty"));
boolean flag = klzhcwUtil.judge(ll, map);
if (flag) {
jsonObject.put("lock_type", "1");
@@ -365,6 +371,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
ivtJson.put("vehicle_type", "");
ivtJson.put("vehicle_code", "");
ivtJson.put("material_id", "");
ivtJson.put("ivt_qty", "0");
wo_ivt.update(ivtJson);
}
} else if (ll.size() == (HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) && !isHasGoods) {
@@ -374,6 +381,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonGT2.put("vehicle_code", "");
jsonGT2.put("vehicle_type", "");
jsonGT2.put("material_id", "");
jsonGT2.put("ivt_qty", "0");
wo_ivt.update(jsonGT2);
JSONObject jsonObject2 = wo.query("point_code = '" + jsonGT2.getString("point_code") + "'").uniqueResult(0);
jsonObject2.put("point_status", "1");

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/inStruct/wql/PDA_InStruct_01.wql
View File

@@ -47,7 +47,7 @@
FROM
sch_base_region
WHERE
region_code = 'GT01'
region_code = 'GT1'
ENDSELECT
ENDQUERY
ENDIF

12
lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java
View File

@@ -4,15 +4,15 @@ package org.nl.wms.pda.scanGroup;
* 区域枚举
*/
public enum HcwNumEnum {
KLZHCQ(1, "KLZHCQ", 12),
KLZCQ(2, "KLZCQ", 25),
KLZHCQ(1, "KLZHCQ", 10),
KLZCQ(2, "KLZCQ", 26),
MLZZCQ(3, "MLZZCQ", 26),
YLJQ(4, "YLJQ", 0),
HNJQ(5, "HNJQ", 0),
YLJQ(4, "YLJQ", 8),
HNJQ(5, "HNJQ", 2),
GT1(6, "GT1", 1),
GT2(7, "GT2", 1),
GT3(8, "GT3", 0),
GT4(9, "GT4", 0);
GT3(8, "GT3", 1),
GT4(9, "GT4", 1);
private int index;
private String code;

29
lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/KlzhcwUtil.java
View File

@@ -36,6 +36,10 @@ public class KlzhcwUtil {
if (ll.size() == 0) ll = structivtService.reload();
String vehicle_code = param.getString("vehicle_code");
String material_code = param.getString("material_code");
String ivt_qty = param.getString("ivt_qty");
if (StrUtil.isEmpty(ivt_qty)){
ivt_qty = "0";
}
VehicleDto vehicle = vehicleService.findByCode(vehicle_code);
String vehicle_type = vehicle.getVehicle_type();
//判断原先缓存个数 如果小于缓存区的个数 就将当前入库的托盘信息添加到缓存中
@@ -47,6 +51,7 @@ public class KlzhcwUtil {
map.put("vehicle_code", vehicle_code);
map.put("vehicle_type", vehicle_type);
map.put("material_code", material_code);
map.put("ivt_qty",ivt_qty);
ll.addLast(map);
//添加以后仍然小于或等于困料缓存区的个数 所以执行小于困料缓存区个数更新库存的逻辑-直接更新库存
flag = this.lessThan25(ll);
@@ -58,6 +63,7 @@ public class KlzhcwUtil {
map.put("vehicle_code", vehicle_code);
map.put("vehicle_type", vehicle_type);
map.put("material_code", material_code);
map.put("ivt_qty",ivt_qty);
ll.addLast(map);
//如果说有手工出库的缓存信息
//将入库的信息添加到缓存中 此时缓存中的个数还是等于困料缓存区个数 所以执行直接更新库存
@@ -75,6 +81,7 @@ public class KlzhcwUtil {
map.put("vehicle_code", vehicle_code);
map.put("vehicle_type", vehicle_type);
map.put("material_code", material_code);
map.put("ivt_qty",ivt_qty);
ll.addLast(map);
flag = this.equle25(ll);
} else if (ll.size() == HcwNumEnum.KLZCQ.getNum() + HcwNumEnum.GT2.getNum()) {
@@ -111,9 +118,12 @@ public class KlzhcwUtil {
MaterialbaseDto materialbaseDto = materialbaseService.findByCode(ll.get(ll.size() - i - 1).getString("material_code"));
jsonObject.put("vehicle_code", ll.get(ll.size() - i - 1).getString("vehicle_code"));
jsonObject.put("vehicle_type", ll.get(ll.size() - i - 1).getString("vehicle_type"));
jsonObject.put("ivt_qty", ll.get(ll.size() - i - 1).getString("ivt_qty"));
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
jsonObject.put("material_id", materialbaseDto.getMaterial_id());
point_status = "3";
}else {
jsonObject.put("material_id", "");
}
jsonObject.put("instorage_time", DateUtil.now());
wo.update(jsonObject);
@@ -137,9 +147,12 @@ public class KlzhcwUtil {
MaterialbaseDto materialbaseDto = materialbaseService.findByCode(ll.get(0).getString("material_code"));
jsonObject.put("vehicle_code", ll.get(0).getString("vehicle_code"));
jsonObject.put("vehicle_type", ll.get(0).getString("vehicle_type"));
jsonObject.put("ivt_qty", ll.get(0).getString("ivt_qty"));
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
jsonObject.put("material_id", materialbaseDto.getMaterial_id());
point_status = "3";
}else {
jsonObject.put("material_id", "");
}
jsonObject.put("instorage_time", DateUtil.now());
wo.update(jsonObject);
@@ -154,12 +167,16 @@ public class KlzhcwUtil {
jsonObject = jsonArray.getJSONObject(i);
String vehicleCode = ll.get(ll.size() - i - 1).getString("vehicle_code");
String vehicleType = ll.get(ll.size() - i - 1).getString("vehicle_type");
String ivt_qty = ll.get(ll.size() - i - 1).getString("ivt_qty");
//修改库存信息
jsonObject.put("vehicle_code", vehicleCode);
jsonObject.put("vehicle_type", vehicleType);
jsonObject.put("ivt_qty", ivt_qty);
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
jsonObject.put("material_id", materialbaseDto.getMaterial_id());
point_status = "3";
}else {
jsonObject.put("material_id", "");
}
jsonObject.put("instorage_time", DateUtil.now());
wo.update(jsonObject);
@@ -175,18 +192,28 @@ public class KlzhcwUtil {
public Boolean equles26(LinkedList<JSONObject> ll, JSONObject param) {
String vehicle_code = param.getString("vehicle_code");
String material_code = param.getString("material_code");
String ivt_qty = param.getString("ivt_qty");
if (StrUtil.isEmpty(ivt_qty)){
ivt_qty = "0";
}
VehicleDto vehicle = vehicleService.findByCode(vehicle_code);
String vehicle_type = vehicle.getVehicle_type();
String vehicle_type = "";
if (ObjectUtil.isNotEmpty(vehicle)){
vehicle_type = vehicle.getVehicle_type();
}
WQLObject wo = WQLObject.getWQLObject("ST_IVT_StructIvt");
WQLObject wo_point = WQLObject.getWQLObject("sch_base_point");
String point_status = "2";
JSONObject jsonObject = wo.query("region_code = '" + HcwNumEnum.GT1.getCode() + "'").uniqueResult(0);
jsonObject.put("vehicle_code", vehicle_code);
jsonObject.put("vehicle_type", vehicle_type);
jsonObject.put("ivt_qty", ivt_qty);
MaterialbaseDto materialbaseDto = materialbaseService.findByCode(material_code);
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
jsonObject.put("material_id", materialbaseDto.getMaterial_id());
point_status = "3";
}else {
jsonObject.put("material_id", "");
}
jsonObject.put("instorage_time", DateUtil.now());
wo.update(jsonObject);

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

@@ -4,15 +4,15 @@ package org.nl.wms.sch.tasks;
* 区域枚举
*/
public enum RegionTypeEnum {
KLZHCQ(1, "KLZHCQ", "空料盅缓存区","1586240366032588800"),
KLZCQ(2, "KLZCQ", "困料暂存区","1586240455950077952"),
MLZZCQ(3, "MLZHCQ", "满料盅缓存区","1586240614075338752"),
YLJQ(4, "YLJQ", "压力机区","1586887408316715008"),
HNJQ(5, "HNJQ", "混碾机区","1586887462549065728"),
GT1(6, "GT1", "1号接驳滚筒机区","1586888185684824064"),
GT2(7, "GT2", "2号接驳滚筒机区","1586888795951861760"),
GT3(8, "GT3", "3号接驳滚筒机区","1586888837689380864"),
GT4(9, "GT4", "4号接驳滚筒机区","1586888946166665216");
KLZHCQ(1, "KLZHCQ", "空料盅缓存区", "1586240366032588800"),
KLZCQ(2, "KLZCQ", "困料暂存区", "1586240455950077952"),
MLZZCQ(3, "MLZHCQ", "满料盅缓存区", "1586240614075338752"),
YLJQ(4, "YLJQ", "压力机区", "1586887408316715008"),
HNJQ(5, "HNJQ", "混碾机区", "1586887462549065728"),
GT1(6, "GT1", "1号接驳滚筒机区", "1586888185684824064"),
GT2(7, "GT2", "2号接驳滚筒机区", "1586888795951861760"),
GT3(8, "GT3", "3号接驳滚筒机区", "1586888837689380864"),
GT4(9, "GT4", "4号接驳滚筒机区", "1586888946166665216");
private int index;
private String code;

51
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java
View File

@@ -201,7 +201,7 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("混碾机呼叫空料盅")
.task_type("task_type")
.task_type("hnjcallempty")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code2)
.priority("1")
@@ -227,18 +227,22 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
throw new BadRequestException("任务已删除或者已完成!");
}
@@ -250,18 +254,23 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
}else {
} else {
throw new BadRequestException("任务已删除或者已完成!");
}

48
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java
View File

@@ -233,7 +233,7 @@ public class YljCallMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("压力机叫料")
.task_type("task_type")
.task_type("yljcallm")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code2)
.priority("1")
@@ -261,16 +261,21 @@ public class YljCallMaterialTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
@@ -285,16 +290,21 @@ public class YljCallMaterialTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
}else {
throw new BadRequestException("任务已删除或者已完成!");

50
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java
View File

@@ -307,7 +307,7 @@ public class HandlingTask extends AbstractAcsTask {
SchTaskDto dto = SchTaskDto.builder().task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
.task_type("sc")
.task_name("手持创建搬运任务")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(start_point_code)
@@ -362,16 +362,21 @@ public class HandlingTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
@@ -385,18 +390,23 @@ public class HandlingTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
}else {
} else {
throw new BadRequestException("任务已删除或者已完成!");
}
}

48
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/KzdjwSendEmpVehicleTask.java
View File

@@ -190,7 +190,7 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask {
SchTaskDto dto = SchTaskDto.builder()
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
.task_type("klzdjwsendempty")
.task_name("空料盅对接位呼叫送空盅")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
@@ -217,16 +217,21 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
@@ -240,16 +245,21 @@ public class KzdjwSendEmpVehicleTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
}else {
throw new BadRequestException("任务已删除或者已完成!");

54
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java
View File

@@ -172,6 +172,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
param.put("material_code", materialbaseDto.getMaterial_code());
}
param.put("ivt_qty",taskObj.getString("qty"));
boolean flag = klzhcwUtil.judge(ll, param);
if (flag) {
jsonEnd.put("lock_type", "1");
@@ -189,6 +190,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
jsonObject.put("vehicle_type", taskObj.getString("vehicle_type"));
jsonObject.put("vehicle_code", taskObj.getString("vehicle_code"));
jsonObject.put("material_id", taskObj.getString("material_id"));
jsonObject.put("ivt_qty", taskObj.getString("qty"));
jsonObject.put("instorage_time", DateUtil.now());
ivtTab.update(jsonObject);
//解锁终点
@@ -335,6 +337,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
String point_code1 = whereJson.getString("point_code1");
String create_mode = whereJson.getString("create_mode");
String is_auto_issue = whereJson.getString("is_auto_issue");
String qty = whereJson.getString("weight");
//生产工单表【PDM_BD_WorkOrder】
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
@@ -362,7 +365,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("混碾机满盅入库之取空")
.task_type("task_type")
.task_type("hnjsendm")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code1)
.priority("1")
@@ -381,7 +384,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("混碾机满盅入库之取满")
.task_type("task_type")
.task_type("hnjsendm")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
.priority("1")
@@ -389,6 +392,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
.is_auto_issue(is_auto_issue)
.task_group_id(task_group_id)
.sort_seq(2)
.material_qty(qty)
.acs_task_type("1")
.create_mode(create_mode)
.material_info_id(workOrderObj.getLong("workorder_id"))
@@ -413,16 +417,21 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
@@ -438,16 +447,21 @@ public class HnjSendMaterialTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException("任务已删除或者已完成!");

51
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java
View File

@@ -181,7 +181,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("定时任务生成空料盅区有料到困料区的任务")
.task_type("task_type")
.task_type("timing")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code1(point_code1)
.point_code2(point_code2)
@@ -226,18 +226,22 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
WmsToAcsServiceImpl wmsToAcsService = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.forceFinishToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
} else {
throw new BadRequestException("任务已删除或者已完成!");
}
@@ -249,18 +253,23 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")),"200")){
Integer task_status = taskObj.getInteger("task_status");
if (task_status >= 5) {
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("task_id", task_id);
map.put("task_code", taskObj.getString("task_code"));
array.add(map);
Map<String, Object> resp = wmsToAcsService.cancelToAcs(array);
if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) {
this.updateTaskStatus(taskObj, "0");
} else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
} else {
this.updateTaskStatus(taskObj, "0");
}else {
throw new BadRequestException(String.valueOf(resp.get("message")));
}
}else {
} else {
throw new BadRequestException("任务已删除或者已完成!");
}

6
lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java
View File

@@ -325,6 +325,7 @@ public class StructivtServiceImpl implements StructivtService {
// ll.clear();
JSONObject jsonObject = wo.query("region_code = '" + HcwNumEnum.GT2.getCode() + "'").uniqueResult(0);
String material_id_gt = jsonObject.getString("material_id");
String ivt_qty = jsonObject.getString("ivt_qty");
JSONObject jsonMa_gt = new JSONObject();
String material_code_gt2 = "";
if (StrUtil.isNotEmpty(material_id_gt)) {
@@ -336,6 +337,7 @@ public class StructivtServiceImpl implements StructivtService {
map.put("vehicle_code", jsonObject.getString("vehicle_code"));
map.put("vehicle_type", jsonObject.getString("vehicle_type"));
map.put("material_code", material_code_gt2);
map.put("ivt_qty", ivt_qty);
ll.addLast(map);
}
JSONArray jsonArray = wo.query("region_code = '" + HcwNumEnum.KLZCQ.getCode() + "'", "point_code").getResultJSONArray(0);
@@ -363,6 +365,7 @@ public class StructivtServiceImpl implements StructivtService {
map.put("vehicle_code", jsonObject1.getString("vehicle_code"));
map.put("vehicle_type", jsonObject1.getString("vehicle_type"));
map.put("material_code", material_code);
map.put("ivt_qty", jsonObject1.getString("ivt_qty"));
ll.addLast(map);
}
} else {
@@ -370,11 +373,10 @@ public class StructivtServiceImpl implements StructivtService {
map.put("vehicle_code", jsonObject1.getString("vehicle_code"));
map.put("vehicle_type", jsonObject1.getString("vehicle_type"));
map.put("material_code", material_code);
map.put("ivt_qty", jsonObject1.getString("ivt_qty"));
ll.addLast(map);
}
}
redisUtils.set("ll", ll);
System.out.println(ll.size());
return ll;
}