From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 114 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5d07400..57efd3a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -78,6 +78,10 @@
private SlaveProperties slaveProperties;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderDetl1ServiceImpl orderDetl1Service;
+ @Autowired
+ private Order1ServiceImpl order1Service;
@Override
@Transactional
@@ -326,7 +330,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(ioType==101?20D:13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -342,9 +346,34 @@
wrkMast.setModiUser(user.getId());
wrkMast.setModiTime(now);
wrkMast.setMemo(Cools.isEmpty(agvStaNo) ? "" : agvStaNo);
+ if(!Cools.isEmpty(taskDto.getLocDtos().get(0).getOrderNo())){
+ wrkMast.setPacked(taskDto.getLocDtos().get(0).getOrderNo());
+ }
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
}
+ String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
+ Order order = orderService.selectByNo(orderNo);
+ if (Cools.isEmpty(order.getAccountDay())) {
+ order.setAccountDay(1);
+ } else {
+ order.setAccountDay(order.getAccountDay() + 1);
+ }
+ orderNo = order.getOrderNo() + "-" + order.getAccountDay();
+ Order1 order2 = order1Service.selectByNo(orderNo);
+ if (Cools.isEmpty(order2)) {
+ //鍒涘缓瀛愯〃琛ㄥご
+ Order1 order1 = new Order1();
+ order1.sync(order);
+ order1.setOrderNo(orderNo);
+ order1.setCreateBy(user.getId());
+ order1.setCreateTime(now);
+ order1.setUpdateTime(new Date());
+ order1.setSettle(2L);
+ order1Service.insert(order1);
+ order2=order1;
+ }
+
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDto locDto : taskDto.getLocDtos()) {
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
@@ -361,7 +390,7 @@
wrkDetl.setIoTime(now);
wrkDetl.setWrkNo(workNo);
wrkDetl.setBatch(locDto.getBatch());
- wrkDetl.setOrderNo(locDto.getOrderNo());
+ wrkDetl.setOrderNo(orderNo);
wrkDetl.setModel(mat.getModel());
wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
wrkDetl.setAppeTime(now);
@@ -372,9 +401,22 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQty2(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), user.getEmail())) {
+ if (!orderDetlService.increaseWorkQty2(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), user.getId())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
+
+ //鐢熸垚鍑鸿揣鍗�
+ OrderDetl1 orderDetl1 = new OrderDetl1();
+ orderDetl1.sync(wrkDetl);
+ orderDetl1.setOrderId(order2.getId());
+ orderDetl1.setWorkQty(wrkDetl.getAnfme());
+ orderDetl1.setStatus(1);
+ orderDetl1.setCreateBy(user.getId());
+ orderDetl1.setUpdateBy(user.getId());
+ orderDetl1.setCreateTime(new Date());
+ orderDetl1.setUpdateTime(new Date());
+ orderDetl1Service.insert(orderDetl1);
+
orderService.updateSettle(orderDetl.getOrderId(), 2L, user.getId());
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
@@ -404,7 +446,15 @@
}
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(taskDto.getLocNo());
+ String orderNo = "";
+ int i = 0;
for (LocDto locDto : taskDto.getLocDtos()) {
+ if (i++ == 0) {
+ orderNo = locDto.getOrderNo();
+ } else if (!orderNo.equals(locDto.getOrderNo())) {
+ throw new CoolException("鍑哄簱璁㈠崟涓嶄竴鑷存棤娉曞嚭搴�");
+ }
+
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
@@ -412,9 +462,9 @@
if (orderDetl == null) {
orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
}
- if (orderDetl.getAnfme() - orderDetl.getWorkQty() == 0) {
- return;
- }
+// if (orderDetl.getAnfme() - orderDetl.getWorkQty() == 0) {
+// return;
+// }
}
@@ -438,7 +488,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(ioType==101?20D:13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -454,11 +504,36 @@
wrkMast.setModiUser(user.getId());
wrkMast.setModiTime(now);
wrkMast.setMemo(Cools.isEmpty(agvStaNo) ? "" : agvStaNo);
+ if(!Cools.isEmpty(taskDto.getLocDtos().get(0).getOrderNo())){
+ wrkMast.setPacked(taskDto.getLocDtos().get(0).getOrderNo());
+ }
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
}
+ //鏂板瀛愬崟
+ Order order = orderService.selectByNo(orderNo);
+ if (Cools.isEmpty(order.getAccountDay())) {
+ order.setAccountDay(1);
+ } else {
+ order.setAccountDay(order.getAccountDay() + 1);
+ }
+ orderNo = order.getOrderNo() + "-" + order.getAccountDay();
+ Order1 order2 = order1Service.selectByNo(orderNo);
+ if (Cools.isEmpty(order2)) {
+ //鍒涘缓瀛愯〃琛ㄥご
+ Order1 order1 = new Order1();
+ order1.sync(order);
+ order1.setOrderNo(orderNo);
+ order1.setCreateBy(user.getId());
+ order1.setCreateTime(now);
+ order1.setUpdateTime(new Date());
+ order1.setSettle(2L);
+ order1Service.insert(order1);
+ order2=order1;
+ }
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDto locDto : taskDto.getLocDtos()) {
+
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
@@ -473,9 +548,9 @@
wrkDetl.setIoTime(now);
wrkDetl.setWrkNo(workNo);
wrkDetl.setBatch(locDto.getBatch());
- wrkDetl.setOrderNo(locDto.getOrderNo());
+ wrkDetl.setOrderNo(orderNo);
wrkDetl.setModel(mat.getModel());
- wrkDetl.setAnfme(locDto.getAnfme() > (orderDetl.getAnfme() - orderDetl.getWorkQty()) ? (orderDetl.getAnfme() - orderDetl.getWorkQty()) : locDto.getAnfme()); // 鏁伴噺
+ wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(user.getId());
wrkDetl.setModiTime(now);
@@ -484,9 +559,21 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQty2(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), wrkDetl.getAnfme(), user.getEmail())) {
+ if (!orderDetlService.increaseWorkQty2(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), wrkDetl.getAnfme(), user.getId())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
+
+ //鐢熸垚鍑鸿揣鍗�
+ OrderDetl1 orderDetl1 = new OrderDetl1();
+ orderDetl1.sync(wrkDetl);
+ orderDetl1.setOrderId(order2.getId());
+ orderDetl1.setWorkQty(wrkDetl.getAnfme());
+ orderDetl1.setStatus(1);
+ orderDetl1.setCreateBy(user.getId());
+ orderDetl1.setUpdateBy(user.getId());
+ orderDetl1.setCreateTime(new Date());
+ orderDetl1.setUpdateTime(new Date());
+ orderDetl1Service.insert(orderDetl1);
orderService.updateSettle(orderDetl.getOrderId(), 2L, user.getId());
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
@@ -954,30 +1041,43 @@
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
//瀛楃涓蹭笉涓虹┖
+ String orderNo = wrkDetl.getOrderNo().split("-")[0];
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+ if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), null, wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo()));
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
for (OrderDetl orderDetl : orderDetls) {
if (orderDetl.getWorkQty() > 0) {
flag = false;
}
}
if (flag) {
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
if (!Cools.isEmpty(order) && order.getSettle() == 2) {
order.setSettle(1L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
}
- if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()))) {
+ if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))) {
throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
}
+
+ //瀵瑰瓙琛ㄨ繘琛屽垹鍑�
+ if (Cools.isEmpty(wrkDetl.getBatch())) {
+ orderDetl1Service.delete(new EntityWrapper<OrderDetl1>().eq("order_no", wrkDetl.getOrderNo()).eq("matnr", wrkDetl.getMatnr()));
+ } else {
+ orderDetl1Service.delete(new EntityWrapper<OrderDetl1>().eq("order_no", wrkDetl.getOrderNo()).eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ }
+ int orderNo1 = orderDetl1Service.selectCount(new EntityWrapper<OrderDetl1>().eq("order_no", wrkDetl.getOrderNo()));
+ if (orderNo1 == 0) {
+ order1Service.delete(new EntityWrapper<Order1>().eq("order_no", wrkDetl.getOrderNo()));
+ }
+
}
}
--
Gitblit v1.9.1