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

分切修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-16 21:11:16 +08:00
parent 8612940e4f
commit 6191aba36d
3 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,7 +522,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功!"); result.put("message", "反馈成功!");
RLock lock = redissonClient.getLock("acs_to_wms:" + type); RLock lock = redissonClient.getLock("acs_to_deviceApply_wms:" + type);
boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
try { try {

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -624,6 +624,9 @@
OPTION 输入.find_type = "3" OPTION 输入.find_type = "3"
point_status = '03' point_status = '03'
ENDOPTION ENDOPTION
OPTION 输入.find_type = "4"
point_status = '02'
ENDOPTION
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

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

@@ -221,11 +221,30 @@ public class CutConveyorTask extends AbstractAcsTask {
tran_jo.put("vehicle_code2", jsonTask.getString("vehicle_code2")); tran_jo.put("vehicle_code2", jsonTask.getString("vehicle_code2"));
tran_jo.put("task_type", "010406"); tran_jo.put("task_type", "010406");
this.createTask(tran_jo); this.createTask(tran_jo);
} else {
//如果有货、且没有任务
left_point = WQL.getWO("PDA_02")
.addParam("point_location", point_location)
.addParam("point_code", point_code2)
.addParam("product_area", product_area)
.addParam("sort_seq", sort_seq)
.addParam("find_type", "4")
.addParam("flag", "18").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(left_point)) {
//创建空载具输送出
JSONObject form = new JSONObject();
form.put("point_code1", jsonTask.getString("point_code1"));
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + left_point.getString("product_area") + "' AND point_type = '7'").uniqueResult(0);
form.put("point_code2", ss_jo.getString("point_code"));
form.put("vehiclie_code2", left_point.getString("vehicle_code"));
//分切输送出
form.put("task_type", "010401");
this.createTask(form);
}
} }
} }
} }
if (jsonTask.getString("task_type").equals("010406")) { if (jsonTask.getString("task_type").equals("010406")) {
JSONObject jsonIvt = ivtTab.query("point_code ='" + point_code1 + "'").uniqueResult(0);
JSONObject jsonIvt2 = ivtTab.query("point_code ='" + point_code2 + "'").uniqueResult(0); JSONObject jsonIvt2 = ivtTab.query("point_code ='" + point_code2 + "'").uniqueResult(0);
@@ -279,15 +298,15 @@ public class CutConveyorTask extends AbstractAcsTask {
String point_code1 = form.getString("point_code1"); String point_code1 = form.getString("point_code1");
String point_code2 = form.getString("point_code2"); String point_code2 = form.getString("point_code2");
JSONObject point1_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code1 + "'").uniqueResult(0); //JSONObject point1_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code1 + "'").uniqueResult(0);
JSONObject point2_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code2 + "'").uniqueResult(0); // JSONObject point2_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code2 + "'").uniqueResult(0);
if (!form.getString("task_type").equals("010507") && !form.getString("task_type").equals("010406")) { if (!form.getString("task_type").equals("010507") && !form.getString("task_type").equals("010406")) {
if (isSingleTask(point_code1) && !point1_jo.getString("point_type").equals("6") && !point1_jo.getString("point_type").equals("7")) { /*if (isSingleTask(point_code1) && !point1_jo.getString("point_type").equals("6") && !point1_jo.getString("point_type").equals("7")) {
throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
} }
if (isSingleTask(point_code2) && !point2_jo.getString("point_type").equals("6") && !point2_jo.getString("point_type").equals("7")) { if (isSingleTask(point_code2) && !point2_jo.getString("point_type").equals("6") && !point2_jo.getString("point_type").equals("7")) {
throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
} }*/
} }
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());