From ebde535c52a9a17c599321104b13b136915b385f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 25 九月 2025 16:53:23 +0800
Subject: [PATCH] 出库任务手动完成时直接推送mes
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b3654de..77b3e03 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1227,7 +1227,7 @@
@Override
@Transactional
- public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
+ public synchronized R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
if (Cools.isEmpty(param)) {
throw new CoolException("璇锋眰鍙傛暟鏈夎锛�" + param);
@@ -1246,6 +1246,10 @@
HashMap<String, Object> xx = new HashMap<>();
List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
for (GwmsGenerateInventoryDto.MatList obj : matList) {
+ int barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("brand", obj.getPackageGroupNo()));
+ if (barcodeCount2 > 0) {
+ throw new CoolException("鍖呰缁勫彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + obj.getPackageGroupNo());
+ }
int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
if (zpalletCount2 > 0) {
throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
@@ -1531,7 +1535,7 @@
return "鍑哄簱缁撴灉涓婃姤鎴愬姛";
}
- private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ public void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
gwmsGenerateInventoryDto.setWarehouseType(4);
gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
@@ -2361,6 +2365,7 @@
order.setCreateTime(new Date());
order.setSettle(1L);
order.setDocType(26L);
+ order.setMemo(param.getMemo());
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
@@ -2390,7 +2395,10 @@
detl.setAnfme(1.0);
detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ detl.setMemo(param.getMemo());
orderDetlMapper.insert(detl);
+ } else {
+ throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
}
}
@@ -2399,7 +2407,7 @@
@Override
@Transactional
- public R unqualifiedOrder(ReturnOrderConfirmParam param) {
+ public R unQualifiedOrder(UnQualifiedOrderConfirmParam param) {
if (Cools.isEmpty(param.getOrderNumber())) {
param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
}
@@ -2416,6 +2424,7 @@
order.setCreateTime(new Date());
order.setSettle(1L);
order.setDocType(27L);
+ order.setMemo(param.getMemo());
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
@@ -2427,14 +2436,14 @@
// 2. 涓�涓�瀵瑰簲閬嶅巻
- List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
+ List<UnQualifiedOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
for (int i = 0; i < volList.size(); i++) {
- ReturnOrderConfirmParam.VolumeNumber vn = volList.get(i);
+ UnQualifiedOrderConfirmParam.VolumeNumber vn = volList.get(i);
// 鏌ヨ鏄惁宸插瓨鍦ㄨ detl
- OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
- param.getOrderNumber(), param.getPackageGroupNo(), vn.getVolumeNumber()
+ OrderDetl detl = orderDetlMapper.selectByOrderNoAndVolumeNo(
+ param.getOrderNumber(), vn.getVolumeNumber()
);
if (detl == null) {
@@ -2443,9 +2452,11 @@
detl.setOrderNo(param.getOrderNumber());
detl.setCreateTime(new Date());
detl.setAnfme(1.0);
- detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ detl.setMemo(param.getMemo());
orderDetlMapper.insert(detl);
+ } else {
+ throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
}
}
--
Gitblit v1.9.1