root/longdianningxing
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-01-31 22:04:20 +08:00
parent b750f18f02
commit 01cfdbd994
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,6 +573,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.addParam("point_code", device_code) .addParam("point_code", device_code)
.addParam("product_area", product_area) .addParam("product_area", product_area)
.addParam("sort_seq", sort_seq) .addParam("sort_seq", sort_seq)
.addParam("find_type","1")
.addParam("flag", "17").process().uniqueResult(0); .addParam("flag", "17").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(right_point) && !right_point.getString("point_status").equals("01")) { if (ObjectUtil.isNotEmpty(right_point) && !right_point.getString("point_status").equals("01")) {
//创建载具横移任务 //创建载具横移任务

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
View File

@@ -149,7 +149,7 @@ public class OutServiceImpl implements OutService {
if (Integer.valueOf(String.valueOf(dtl_type)) % 2 == 0) { if (Integer.valueOf(String.valueOf(dtl_type)) % 2 == 0) {
jo.put("task_status", TaskStatusEnum.SURE_START.getCode()); jo.put("task_status", TaskStatusEnum.SURE_START.getCode());
jo.put("point_code1", ""); jo.put("point_code1", "");
jo.put("point_code2", ""); jo.put("point_code4", "");
} }
jo.put("task_type", "010403"); jo.put("task_type", "010403");
cutTrussTask.createTask(jo); cutTrussTask.createTask(jo);

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
View File

@@ -174,14 +174,14 @@ public class ShippingServiceImpl implements ShippingService {
//如果为左边点位判断右边是否存在未完成的任务，如果有则提示不能下发 //如果为左边点位判断右边是否存在未完成的任务，如果有则提示不能下发
//判断输送出来的任务起点是否靠近分切机，如果靠近分切机且远离分切机的点位上存在载具且不存在任务进行载具横移 //判断输送出来的任务起点是否靠近分切机，如果靠近分切机且远离分切机的点位上存在载具且不存在任务进行载具横移
char dtl_type = empty_point.getString("point_code").charAt(empty_point.getString("point_code").length() - 1); char dtl_type = empty_point.getString("point_code").charAt(empty_point.getString("point_code").length() - 1);
if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) { /*if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) {
JSONObject right_point = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_location = '" + empty_point.getString("point_location") + "' AND product_area = '" + empty_point.getString("product_area") + "' AND sort_seq = '" + empty_point.getString("sort_seq") + "' order by point_code desc").uniqueResult(0); JSONObject right_point = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_location = '" + empty_point.getString("point_location") + "' AND product_area = '" + empty_point.getString("product_area") + "' AND sort_seq = '" + empty_point.getString("sort_seq") + "' order by point_code desc").uniqueResult(0);
//判断是否存在任务 //判断是否存在任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + right_point.getString("point_code") + "' OR point_code2 = '" + right_point.getString("point_code") + "') AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + right_point.getString("point_code") + "' OR point_code2 = '" + right_point.getString("point_code") + "') AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) { if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException(empty_point.getString("point_code") + "所在一截输送线存在未完成的任务，请稍等几分钟后进行下发！"); throw new BadRequestException(empty_point.getString("point_code") + "所在一截输送线存在未完成的任务，请稍等几分钟后进行下发！");
} }
} }*/
//下发输送线任务 //下发输送线任务
JSONObject form = new JSONObject(); JSONObject form = new JSONObject();

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

@@ -257,18 +257,18 @@ public class CutTrussTask extends AbstractAcsTask {
String point_code2 = form.getString("point_code2"); String point_code2 = form.getString("point_code2");
String point_code3 = form.getString("point_code3"); String point_code3 = form.getString("point_code3");
String point_code4 = form.getString("point_code4"); String point_code4 = form.getString("point_code4");
if (cutConveyorTask.isSingleTask(point_code1) && StrUtil.isNotEmpty(point_code1)) { /*if (cutConveyorTask.isSingleTask(point_code1) && StrUtil.isNotEmpty(point_code1)) {
throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
} }*/
if (cutConveyorTask.isSingleTask(point_code2) && StrUtil.isNotEmpty(point_code2)) { if (cutConveyorTask.isSingleTask(point_code2) && StrUtil.isNotEmpty(point_code2)) {
throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
} }
if (cutConveyorTask.isSingleTask(point_code3) && StrUtil.isNotEmpty(point_code3)) { if (cutConveyorTask.isSingleTask(point_code3) && StrUtil.isNotEmpty(point_code3)) {
throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
} }
if (cutConveyorTask.isSingleTask(point_code4) && StrUtil.isNotEmpty(point_code4)) { /*if (cutConveyorTask.isSingleTask(point_code4) && StrUtil.isNotEmpty(point_code4)) {
throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务！");
} }*/
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());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE")); json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));