From 15a46f0c62ff398b49ba35105c83e0011a140e32 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 12:48:01 +0800
Subject: [PATCH 01/30] =?UTF-8?q?opt:6.18=20=E7=BA=BF=E4=B8=8A=E9=83=A8?=
=?UTF-8?q?=E7=BD=B2=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/PdmBiSubpackagerelationMapper.xml | 2 +-
.../PdmBiSubpackagerelationServiceImpl.java | 22 +++++++++----------
.../config/thread/AsyncTaskExecutePool.java | 3 +++
.../src/views/wms/pdm/sub/MaterDialog.vue | 2 +-
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index d08ade145..b2dd6d33c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -54,7 +54,7 @@
FROM
pdm_bi_subpackagerelation
WHERE
- container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '3')
+ container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '6')
AND sale_order_name LIKE CONCAT('%', #{sale_order_name}, '%')
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 006ccd474..bb2774e37 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -404,9 +404,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl packagerelationList = JSONObject.parseArray(whereJson.getJSONArray("tableMater").toJSONString(), PdmBiSubpackagerelation.class);
List isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList());
- if (isOutBox.size() > 0) {
- throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷");
- }
+ if (isOutBox.size() > 0) {
+ throw new BadRequestException("标记为黄色的子卷号已分配木箱，请重新选择未分配木箱的子卷");
+ }
JSONArray jsonArray = whereJson.getJSONArray("tableMater");
if (jsonArray == null || jsonArray.size() == 0) {
throw new BadRequestException("无选中子卷信息");
@@ -467,14 +467,14 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl装箱区agv任务
- String finalDeviceCode = deviceCode;
- CompletableFuture.runAsync(() -> {
- try {
- agvTransfer(packagerelationList, finalDeviceCode, boxSn);
- } catch (Exception e) {
- log.error("异常信息：" + e);
- }
- }, pool);
+ // String finalDeviceCode = deviceCode;
+ // CompletableFuture.runAsync(() -> {
+ // try {
+ // agvTransfer(packagerelationList, finalDeviceCode, boxSn);
+ // } catch (Exception e) {
+ // log.error("异常信息：" + e);
+ // }
+ // }, pool);
}
private String getPointCode() {
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java b/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
index d0405e84d..9eb668558 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java
@@ -17,6 +17,7 @@ package org.nl.config.thread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -63,6 +64,8 @@ public class AsyncTaskExecutePool implements AsyncConfigurer {
return executor;
}
+
+
@Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return (throwable, method, objects) -> {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
index 64daf2c6d..7313a8da2 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -66,7 +66,7 @@ export default {
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
- query: { search: 'MX', material_id: '' },
+ query: { box: '木箱', material_id: '' },
crudMethod: { ...crudMaterattr }
})
},
From cf95dc505c812f4f348aca371946dfc70149491a Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 15:33:14 +0800
Subject: [PATCH 02/30] =?UTF-8?q?fix:=E5=8F=91=E8=B4=A7=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E6=9C=A8=E7=AE=B1=E5=8F=B7=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=AD=90=E5=8D=B7?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iostorInv/util/impl/InBussManageServiceImpl.java | 6 +-----
.../util/impl/SendOutManageServiceImpl.java | 12 +++++++++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
index 17cfb5c40..6f9d65c40 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
@@ -215,11 +215,7 @@ public class InBussManageServiceImpl implements InBussManageService {
}
List pcsnList = Arrays.asList(material_barcode.split(","));
// 查询子卷包装关系
-// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')")
-// .getResultJSONArray(0).toJavaList(JSONObject.class);
-// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')")
-// .getResultJSONArray(0).toJavaList(JSONObject.class);
- List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1')")
+ List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1','99')")
.getResultJSONArray(0).toJavaList(JSONObject.class);
if (ObjectUtil.isEmpty(subList)) {
throw new BadRequestException("未查询到子卷包装信息!");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
index 09408f133..99e8645dc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java
@@ -1,11 +1,13 @@
package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.sch.point.dao.SchBasePoint;
import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper;
import org.nl.b_lms.sch.point.service.IschBasePointService;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -69,13 +72,16 @@ public class SendOutManageServiceImpl implements SendOutManageService {
.eq(SchBasePoint::getIs_used, IOSEnum.IS_NOTANDYES.code("是"))
.eq(SchBasePoint::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
);
-
// 1.查询此木箱号的子卷包装关系
- JSONObject jsonSub = subTab.query("package_box_sn = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0);
+ if(StringUtils.isEmpty(whereJson.getString("vehicle_code"))){
+ throw new BadRequestException("木箱号不能为空！");
+ }
+ //木箱号可能用逗号隔开
+ String vehicleCode = Arrays.asList(whereJson.getString("vehicle_code").split(",")).get(0);
+ JSONObject jsonSub = subTab.query("package_box_sn = '" + vehicleCode + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSub)) {
throw new BadRequestException("未查询到该木箱对应的包装关系！");
}
-
// 2.找相同订单号的所有排
jsonSub.put("region_id", RegionTypeEnum.TWO_FH01.getId());
List pointLikeOrder = schBasePointMapper.queryLikeOrderRow(jsonSub);
From 41cf6d7466e9aa4641ab39a138bb09d04a931b17 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 16:00:57 +0800
Subject: [PATCH 03/30] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/PdmBiSubpackagerelationMapper.java | 2 ++
.../mapper/PdmBiSubpackagerelationMapper.xml | 12 +++++++++++
.../PdmBiSubpackagerelationServiceImpl.java | 20 +------------------
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
index 315554a65..c269fc620 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
@@ -28,4 +28,6 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper queryContainerNameBySaleOrder( @Param("sale_order_name") String sale_order_name);
+
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index b2dd6d33c..032d3abad 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -72,5 +72,17 @@
ORDER BY
MAX(create_time) DESC
+
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index bb2774e37..f4c885abc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -153,25 +153,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl queryContainerNameBySaleOrder(Map whereJson) {
- LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- if (whereJson.containsKey("customer_description")) {
- queryWrapper.like(PdmBiSubpackagerelation::getCustomer_description, whereJson.get("customer_description"));
- }
- if (whereJson.containsKey("sale_order_name")) {
- queryWrapper.eq(PdmBiSubpackagerelation::getSale_order_name, whereJson.get("sale_order_name"));
- }
- if (whereJson.containsKey("customer_name")) {
- queryWrapper.like(PdmBiSubpackagerelation::getCustomer_name, whereJson.get("customer_name"));
- }
- if (whereJson.containsKey("status")) {
- if ("99".equals(whereJson.get("status"))) {
- queryWrapper.eq(PdmBiSubpackagerelation::getStatus, whereJson.get("status"));
- } else {
- queryWrapper.ge(PdmBiSubpackagerelation::getStatus, whereJson.get("status"));
- }
- }
- queryWrapper.orderByDesc(PdmBiSubpackagerelation::getBox_group);
- List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.selectList(queryWrapper);
+ List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(whereJson.get("sale_order_name").toString());
Map countByGroup = pdmBiSubpackagerelationList.stream()
.filter(item -> item.getBox_group() != null)
.collect(Collectors.groupingBy(PdmBiSubpackagerelation::getBox_group, Collectors.counting()));
From 9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22 Mon Sep 17 00:00:00 2001
From: liuxy
Date: Tue, 18 Jun 2024 16:34:21 +0800
Subject: [PATCH 04/30] =?UTF-8?q?rev=EF=BC=9A1.=E5=87=BA=E5=BA=93=E5=85=AD?=
=?UTF-8?q?=E4=B8=AA=E4=BD=8D=E7=BD=AE=E5=9C=A8=E4=B8=80=E4=B8=AA=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E5=8D=95=E4=B8=8A=E4=B8=80=E8=B5=B7=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=E6=8A=A5=E9=94=99=EF=BC=9A?=
=?UTF-8?q?=E2=80=98=E4=BB=93=E4=BD=8D=E4=B8=8D=E8=B6=B3=E2=80=99=202.?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8D=86=E6=89=8E=E7=9A=84=E6=97=B6=E5=80=99?=
=?UTF-8?q?=E8=A6=81=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E6=AD=A4=E8=A7=84?=
=?UTF-8?q?=E6=A0=BC=E6=98=AF=E5=90=A6=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E7=AE=B1=E5=AD=90=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E8=B0=83=E7=94=A8acs=E6=8E=A5=E5=8F=A3=E6=94=BE?=
=?UTF-8?q?=E8=A1=8C=203.=E6=8D=86=E6=89=8E=E7=9A=84=E6=97=B6=E5=80=99?=
=?UTF-8?q?=E6=8D=86=E6=89=8E=E4=BD=8D=E5=A6=82=E6=9E=9C=E6=9C=89=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E7=9B=B8=E5=90=8C=E8=A7=84=E6=A0=BC=E7=9A=84=E7=AE=B1?=
=?UTF-8?q?=E5=AD=90=20=E8=A6=81=E4=BC=98=E5=85=88=E6=94=BE=E5=9C=A8?=
=?UTF-8?q?=E8=BF=99=E4=B8=AA=E4=BD=8D=E7=BD=AE=E4=B8=8A=204.=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E8=BD=AC=E5=BA=93=E4=BB=BB=E5=8A=A1=E6=97=B6=20?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8F=90=E5=89=8D=E7=A1=AE=E5=AE=9A=E5=B7=B7?=
=?UTF-8?q?=E9=81=93=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/b_lms/sch/tasks/TwoLashTask.java | 16 +++++
.../nl/b_lms/sch/tasks/TwoOutHeapTask.java | 1 +
.../org/nl/b_lms/sch/tasks/TwoOutTask.java | 3 +-
.../impl/StIvtIostorinvOutServiceImpl.java | 59 +++++++++++++------
.../util/impl/InBussManageServiceImpl.java | 38 +++++++++---
.../util/impl/LashManageServiceImpl.java | 4 ++
.../util/impl/OutBussManageServiceImpl.java | 33 +++++++++++
.../util/service/InBussManageService.java | 1 +
.../util/service/LashManageService.java | 2 +
9 files changed, 131 insertions(+), 26 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
index 285d30ffe..43f1abfb5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
@@ -141,6 +141,21 @@ public class TwoLashTask extends AbstractAcsTask {
// 完成
if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
+ // 判断当前任务组的所有任务是否都为完成：如果都为完成则 调用acs接口允许此木箱离开
+ JSONObject groupTask = WQLObject.getWQLObject("sch_base_task").query("task_group_id = '" + taskObj.getString("task_group_id") + "' and is_delete = '0' and task_status <> 07 and task_id <> '"+taskObj.getString("task_id")+"'")
+ .uniqueResult(0);
+
+ if (ObjectUtil.isEmpty(groupTask)) {
+ // 更新点位载具、数量
+ JSONObject pointDao = pointTab.query("point_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
+ pointDao.put("vehicle_code", "");
+ pointDao.put("vehicle_qty",0);
+ WQLObject.getWQLObject("sch_base_point").update(pointDao);
+
+ // TODO 调用acs接口告诉此木箱可以离开
+
+ }
+
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
}
@@ -219,6 +234,7 @@ public class TwoLashTask extends AbstractAcsTask {
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("start_device_code"));
json.put("point_code2", form.getString("next_device_code"));
+ json.put("task_group_id", form.getString("task_group_id"));
json.put("is_auto_issue", form.getString("is_auto_issue"));
json.put("handle_class", this.getClass().getName());
json.put("create_id", SecurityUtils.getCurrentUserId());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
index 353b5f2b1..c059e9993 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
@@ -110,6 +110,7 @@ public class TwoOutHeapTask extends AbstractAcsTask {
JSONObject jsonParam = new JSONObject();
jsonParam.put("device_code",jsonTask.getString("point_code2"));
jsonParam.put("vehicle_code",jsonTask.getString("vehicle_code"));
+ jsonParam.put("task_group_id",jsonTask.getString("task_group_id"));
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
bean1.createLashTask(jsonParam);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
index 62f100129..b530d2f1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
@@ -163,13 +163,14 @@ public class TwoOutTask extends AbstractAcsTask {
bean.finishTask(jsonTask);
// 判断此任务组是否全部完成
- JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'")
+ JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'")
.getResultJSONArray(0);
// 下发堆垛机至行架任务（2个行架位）
JSONObject jsonParam = new JSONObject();
jsonParam.put("device_code",jsonTask.getString("point_code2"));
jsonParam.put("vehicle_code",jsonTask.getString("vehicle_code"));
+ jsonParam.put("task_group_id",jsonTask.getString("task_group_id"));
jsonParam.put("vehicle_type",jsonTask.getJSONObject("request_param").getString("containerType"));
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index dd5ad95cf..3cc003f8b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -33,6 +33,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.system.service.param.ISysParamService;
import org.nl.wms.basedata.st.service.StorattrService;
import org.nl.wms.basedata.st.service.dto.StorattrDto;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
@@ -102,6 +103,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl '07' and is_delete = '0'").uniqueResult(0);
+ if (ObjectUtil.isNotEmpty(jsonTask)) {
flag = false;
- } else {
- // 不相同：判断是否有此木箱的任务
- JSONObject jsonTask = taskService.query("table_fk = '" + iostorinv_id + "' and vehicle_code = '" + jsonLow.getString("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0);
-
- if (ObjectUtil.isNotEmpty(jsonTask)) {
- flag = false;
- }
-
}
+
}
if (flag) {
@@ -1160,7 +1154,36 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl().lambda()
+ .eq(BstIvtBoxinfo::getBox_no, jsonLow.getString("storagevehicle_code"))
+ );
+
+ String box_high = boxDao.getBox_high();
+ if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
+ height = "1";
+ } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
+ height = "2";
+ } else {
+ height = "3";
+ }
+ moveParam.put("height", height);
+ moveParam.put("vehicle_type", boxDao.getVehicle_type());
+ moveParam.put("move_block_num", jsonLow.getString("block_num"));
+
+ // 查询物料id
+ StIvtIostorinvdis disDao = iStIvtIostorinvdisService.list(
+ new QueryWrapper().lambda()
+ .ne(StIvtIostorinvdis::getWork_status,IOSEnum.BILL_STATUS.code("完成"))
+ .eq(StIvtIostorinvdis::getBox_no, jsonLow.getString("storagevehicle_code"))
+ ).get(0);
+
+ moveParam.put("material_id", disDao.getMaterial_id());
JSONObject jsonMove = inBussManageService.getOneStruct(moveParam);
// 生成任务
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
index 17cfb5c40..b299ad1cb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONAware;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -119,12 +120,27 @@ public class InBussManageServiceImpl implements InBussManageService {
* 判断是否有仓位
* 判断条件：库区、仓库、是否启用、是否删除、未锁定、没有载具
*/
- JSONArray attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
- "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
- "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " +
- "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" +
- "AND height = '" + jsonObject.getString("height") + "'" +
- "AND sect_id = '" + jsonObject.getString("sect_id") + "'").getResultJSONArray(0);
+ // 是否是移库: 提前确定的巷道
+ String block_num = jsonObject.getString("move_block_num");
+
+ JSONArray attrArry = new JSONArray();
+ if (ObjectUtil.isEmpty(block_num)) {
+ attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
+ "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
+ "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " +
+ "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" +
+ "AND height = '" + jsonObject.getString("height") + "'" +
+ "AND sect_id = '" + jsonObject.getString("sect_id") + "'").getResultJSONArray(0);
+ } else {
+ attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
+ "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
+ "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " +
+ "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" +
+ "AND height = '" + jsonObject.getString("height") + "'" +
+ "AND sect_id = '" + jsonObject.getString("sect_id") + "' AND block_num = '"+block_num+"'")
+ .getResultJSONArray(0);
+ }
+
if (ObjectUtil.isEmpty(attrArry)) {
notInRowList.clear();
@@ -143,7 +159,10 @@ public class InBussManageServiceImpl implements InBussManageService {
jsonSub.put("vehicle_type", jsonObject.getString("vehicle_type"));
jsonSub.put("height", jsonObject.getString("height"));
- String block_num = getMinBlock(jsonSub);
+ // 不是移库则需要找新巷道
+ if (ObjectUtil.isEmpty(block_num)) {
+ block_num = getMinBlock(jsonSub);
+ }
/*
* 确定哪排：查看每排相同木箱规格等 的数量，找到数量最小的那排
*/
@@ -156,6 +175,11 @@ public class InBussManageServiceImpl implements InBussManageService {
jsonSub.put("row_num", row_num);
JSONObject jsonAttr = queryStruct(jsonSub);
+ // 如果是移库空并且仓位为空则报错
+ if (ObjectUtil.isNotEmpty(jsonObject.getString("move_block_num")) && ObjectUtil.isEmpty(jsonAttr)) {
+ throw new BadRequestException("仓位不足!");
+ }
+
// 为空则新找巷道
if (ObjectUtil.isEmpty(jsonAttr)) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
index e9b6c7a76..d9d300604 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
@@ -10,6 +10,8 @@ import org.hibernate.annotations.Source;
import org.nl.b_lms.sch.point.dao.SchBasePoint;
import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper;
import org.nl.b_lms.sch.point.service.IschBasePointService;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper;
import org.nl.b_lms.sch.tasks.TwoLashTask;
import org.nl.b_lms.sch.tasks.TwoOutHeapTask;
import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
@@ -184,6 +186,7 @@ public class LashManageServiceImpl implements LashManageService {
jsonTaskParam.put("task_type", "010707");
jsonTaskParam.put("start_device_code", whereJson.getString("device_code"));
jsonTaskParam.put("next_device_code", end_point);
+ jsonTaskParam.put("task_group_id", whereJson.getString("task_group_id"));
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("is_auto_issue", is_move);
@@ -218,6 +221,7 @@ public class LashManageServiceImpl implements LashManageService {
jsonTaskParam.put("task_type", "010720");
whereJson.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("point_code1", whereJson.getString("device_code"));
+ jsonTaskParam.put("task_group_id", whereJson.getString("task_group_id"));
jsonTaskParam.put("point_code2", next_device_code);
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("request_param", whereJson);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
index c419f8b50..acb269bd8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
@@ -5,6 +5,9 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
+import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdtlService;
@@ -17,6 +20,7 @@ import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.system.service.param.ISysParamService;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.st.inbill.service.StorPublicService;
import org.nl.wms.st.instor.service.HandMoveStorService;
@@ -72,6 +76,12 @@ public class OutBussManageServiceImpl implements OutBussManageService {
@Autowired
private HandMoveStorService handMoveStorService;
+ @Autowired
+ private ISysParamService iSysParamService;
+
+ @Autowired
+ private IBstIvtBoxinfoService iBstIvtBoxinfoService;
+
@Override
@Transactional
public void lockStruct(List param, JSONObject json) {
@@ -381,6 +391,29 @@ public class OutBussManageServiceImpl implements OutBussManageService {
moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
moveParam.put("box_no", json.getString("storagevehicle_code"));
moveParam.put("material_id", jsonMater.getString("material_id"));
+ //根据木箱高度，判断入库仓位的高度、
+ String height = "";
+ String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
+ String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
+ // 查询木箱信息
+ BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
+ new QueryWrapper().lambda()
+ .eq(BstIvtBoxinfo::getBox_no, json.getString("storagevehicle_code"))
+ );
+
+ String box_high = boxDao.getBox_high();
+ if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
+ height = "1";
+ } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
+ height = "2";
+ } else {
+ height = "3";
+ }
+ moveParam.put("height", height);
+ moveParam.put("vehicle_type", boxDao.getVehicle_type());
+ // 移库巷道
+ moveParam.put("move_block_num",json.getString("block_num"));
+
JSONObject jsonMove = inBussManageService.getOneStruct(moveParam);
// 查询移出货位的库存物料
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBussManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBussManageService.java
index 332a11f87..45ebf41ae 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBussManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/InBussManageService.java
@@ -38,6 +38,7 @@ public interface InBussManageService {
* sect_id：库区标识
* material_id: 物料标识
* box_no：木箱号
+ * move_block_num: 是否移库：提前确定巷道
* }
* @return JSONObject 仓位对象
*/
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
index 0d86dce68..d5ae9ab9e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/LashManageService.java
@@ -17,6 +17,7 @@ public interface LashManageService {
* @param whereJson {
* device_code：起点
* vehicle_code： 箱号
+ * task_group_id： 任务组
*
* }
*/
@@ -28,6 +29,7 @@ public interface LashManageService {
* device_code：起点
* vehicle_code： 箱号
* vehicle_type: 载具类型
+ * task_group_id: 任务组
*
* }
*/
From 2c208789ce427d9e7683babf60bf3b557b07bc73 Mon Sep 17 00:00:00 2001
From: liuxy
Date: Tue, 18 Jun 2024 16:35:05 +0800
Subject: [PATCH 05/30] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 3cc003f8b..600a4ca50 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1270,6 +1270,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl row.getString("task_id").equals(json.getString("task_code")))
.collect(Collectors.toList()).get(0);
+
// 完成
if (jsonTask.getString("task_status").equals(TaskStatusEnum.FINISHED.getCode())) {
From ceb0bac4970dce23920b9b0d96404dd7d8d16f9c Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 17:17:57 +0800
Subject: [PATCH 06/30] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +-
.../src/main/java/org/nl/wms/sch/AcsUtil.java | 6 +++++-
.../java/org/nl/wms/sch/manage/AbstractAcsTask.java | 11 ++++++-----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 19d21baf7..af64a785e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1905,7 +1905,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 6-退货入库
whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库"));
whereJson.put("box_no", whereJson.getString("material_barcode"));
- JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0);
+ JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1','99')").getResultJSONArray(0);
if (ObjectUtil.isEmpty(resultJSONArray)) {
throw new BadRequestException("未查询到子卷包装信息!");
}
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 79a096006..60d2083a7 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
@@ -50,6 +50,8 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
String url =acs_url + api;
+ //String url ="10.1.3.96:8011/"+ api;
+ //String url ="10.21.1.196:8011/"+ api;
try {
JSONArray rows = new JSONArray();
rows.add(jo);
@@ -117,7 +119,9 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
- String url = acs_url + api;
+ //String url = acs_url + api;
+ //String url ="10.1.3.96:8011/"+ api;
+ String url ="10.21.1.196:8011/"+ api;
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(list))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
index f157990bb..7b7b7f3a3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
@@ -108,12 +108,13 @@ public abstract class AbstractAcsTask {
*
*/
public JSONObject immediateNotifyAcs(String task_id) {
- List taskList = this.schedule();
- if (ObjectUtil.isNotEmpty(taskList)) {
- JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
- return AcsUtil.notifyAcs("api/wms/task", arr);
- }
+ List taskList = this.schedule();
+ if (ObjectUtil.isNotEmpty(taskList)) {
+ JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
+ return AcsUtil.notifyAcs("api/wms/task", arr);
+ }
return null;
+
}
/**
From bee84574962492ae5d2a7b5bea408ca9e28ae742 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 17:19:56 +0800
Subject: [PATCH 07/30] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
index 7313a8da2..8cae9799c 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -66,7 +66,7 @@ export default {
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
- query: { box: '木箱', material_id: '' },
+ query: { box: '木箱', search: '木箱', material_id: '' },
crudMethod: { ...crudMaterattr }
})
},
From 87dca36386ed67c76ae18de40769f11ce696a2fd Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 18:19:23 +0800
Subject: [PATCH 08/30] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../b_lms/sch/tasks/first_floor_area/DjqTask.java | 2 +-
.../b_lms/sch/tasks/first_floor_area/GzqTask.java | 2 +-
.../sch/tasks/first_floor_area/KzjhcwTask.java | 14 ++++++++------
.../sch/tasks/first_floor_area/MzhcwTask.java | 2 +-
.../sch/tasks/first_floor_area/SendKzjTask.java | 2 +-
.../sch/tasks/first_floor_area/SsxDjwTask.java | 2 +-
.../sch/tasks/first_floor_area/ZxDjwTask.java | 2 +-
.../b_lms/sch/tasks/first_floor_area/ZxqTask.java | 2 +-
8 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
index 25e5a07b2..40f370f94 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
@@ -184,7 +184,7 @@ public class DjqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
index 7f6dc17bf..930b9e5ef 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
@@ -169,7 +169,7 @@ public class GzqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java
index 5741b0a73..db3c611fe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java
@@ -173,7 +173,7 @@ public class KzjhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
@@ -217,7 +217,7 @@ public class KzjhcwTask extends AbstractAcsTask {
*/
public void toKzjHcw1(String pointCode) {
//存在空载具缓存位无空载具的点位
- List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
+ List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", "");
String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) {
@@ -255,21 +255,23 @@ public class KzjhcwTask extends AbstractAcsTask {
public void toKzjHcw(String pointCode) {
//存在空载具缓存位无空载具的点位
- List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2","");
+ List kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", "");
String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) {
pointCode1 = pointCode;
} else {
//查询装箱区有空载具
- List zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1","");
+ List zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", "");
//装箱区有空载具
if (CollectionUtils.isNotEmpty(zxqPointList)) {
pointCode1 = zxqPointList.get(0).getPoint_code();
} else {
//待检区有空载具
- List djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1","");
- pointCode1 = djqPointList.get(0).getPoint_code();
+ List djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", "");
+ if (CollectionUtils.isNotEmpty(djqPointList)) {
+ pointCode1 = djqPointList.get(0).getPoint_code();
+ }
}
}
//去装箱区搬运空载具
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
index ff459e99d..73f62fd36 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
@@ -327,7 +327,7 @@ public class MzhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
index 7e17dc23f..1212b86aa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
@@ -146,7 +146,7 @@ public class SendKzjTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
index de5b828e7..65eb95275 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
@@ -165,7 +165,7 @@ public class SsxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
index 67c80e0b4..e829f8d1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
@@ -196,7 +196,7 @@ public class ZxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
index ed1bcfbd7..eac540018 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
@@ -270,7 +270,7 @@ public class ZxqTask extends AbstractAcsTask {
.request_param(form.getString("request_param"))
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
- .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area"))
+ .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build();
SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task);
From daa1a8a64e72a8653d28cc5137837fee0d4576cb Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 18:20:29 +0800
Subject: [PATCH 09/30] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java | 2 --
1 file changed, 2 deletions(-)
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 60d2083a7..7b7bd1623 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
@@ -50,8 +50,6 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
String url =acs_url + api;
- //String url ="10.1.3.96:8011/"+ api;
- //String url ="10.21.1.196:8011/"+ api;
try {
JSONArray rows = new JSONArray();
rows.add(jo);
From 810e8bb510a826021dc41407af3b6593f0966222 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Jun 2024 20:53:13 +0800
Subject: [PATCH 10/30] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?=
=?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pda/controller/VehicleTwoController.java | 16 +++++
.../PdmBiSubpackagerelationServiceImpl.java | 11 ++--
.../BstIvtPackageinfoivtController.java | 59 +++++++++++++++++++
.../service/IbstIvtPackageinfoivtService.java | 5 +-
.../impl/BstIvtPackageinfoivtServiceImpl.java | 45 +++++++++-----
.../sch/tasks/first_floor_area/MzhcwTask.java | 1 -
.../acs/service/impl/AcsToWmsServiceImpl.java | 17 +++---
.../src/views/wms/pdm/sub/DivDialog.vue | 1 -
.../src/views/wms/pdm/sub/MaterDialog.vue | 2 +-
9 files changed, 125 insertions(+), 32 deletions(-)
create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
index 8ea7c4852..a22ba2469 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.pda.service.VehicleTwoService;
+import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
import org.nl.modules.logging.annotation.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
/**
* @author liuxy
* @date 2022-05-25
@@ -26,6 +29,10 @@ public class VehicleTwoController {
@Autowired
private VehicleTwoService vehicleTwoService;
+ @Resource
+ private IbstIvtPackageinfoivtService bstIvtPackageInfoIvtService;
+
+
@PostMapping("/vehicleIn")
@Log("入空载具")
@SaIgnore
@@ -53,4 +60,13 @@ public class VehicleTwoController {
public ResponseEntity