From 9145f8a44c6ae733019e43c775cc30243032e502 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 16:16:43 +0800
Subject: [PATCH] 拍照触发修改
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 125 insertions(+), 39 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 e7e15e9..9322455 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -76,6 +76,8 @@
@Autowired
private OrderDetlService orderDetlService;
@Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
private ConfigService configService;
@Autowired
private WcsController wcsController;
@@ -367,6 +369,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
@@ -692,7 +695,12 @@
// 鍒ゆ柇鏄惁鏄洏鐐瑰崟
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
- int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
+ Order order = orderPakout == null ? orderService.selectByNo(orderNo) : null;
+ if (orderPakout == null && order == null) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦細" + orderNo);
+ }
+ Long docType = orderPakout != null ? orderPakout.getDocType() : order.getDocType();
+ int ioType = Objects.equals(docType, 8L) ? 107 : (taskDto.isAll() ? 101 : 103);
StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
List<LocMast> list = locMastMapper.selectList(
new EntityWrapper<LocMast>()
@@ -744,6 +752,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
@@ -755,9 +764,14 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDto locDto : taskDto.getLocDtos()) {
if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
-// OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand()
+ OrderDetl orderDetl = orderPakout != null
+ ? OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand()
+ ,locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3())
+ : orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand()
,locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3());
+ if (orderDetl == null) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦細" + locDto.getOrderNo() + ", " + locDto.getMatnr());
+ }
// if (orderDetl == null) {
//// orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
// orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
@@ -792,11 +806,22 @@
// throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
// }
// orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()
- , locDto.getAnfme());
- OrderInAndOutUtil.updateOrder(Boolean.FALSE,orderDetl.getOrderId(), 2L, userId);
+ if (orderPakout != null) {
+ OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()
+ , locDto.getAnfme());
+ OrderInAndOutUtil.updateOrder(Boolean.FALSE,orderDetl.getOrderId(), 2L, userId);
+ } else {
+ if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺澶辫触");
+ }
+ if (!orderService.updateSettle(orderDetl.getOrderId(), 2L, userId)) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
+ }
}
//淇敼agv澶囨枡鍖虹姸鎬�
if(locMastRgv.getLocSts().equals("O")){
@@ -857,7 +882,7 @@
public String emptyPlateIn(Integer devpNo, Long userId) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
- // 妫�绱㈠簱浣�
+ // 妫�绱㈠簱浣嶏紱浜哄伐绌烘墭鐩樺叆搴撳浐瀹氫紶 staDescId=10锛屽疄闄呮壘浣嶈鍒欓泦涓湪 CommonService銆�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
@@ -963,6 +988,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
@@ -1025,6 +1051,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setAppeUser(1L);
wrkMast.setAppeTime(now);
wrkMast.setModiUser(1L);
@@ -1509,38 +1536,39 @@
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
+ rollbackPakoutOrderWorkQty(wrkMast, wrkDetls, userId, now);
for (WrkDetl wrkDetl : wrkDetls) {
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
-// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
-// }
- OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),
- wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme());
-
- //淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
- boolean flag = true;
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
- for(OrderDetl orderDetl : orderDetls){
- if(orderDetl.getWorkQty() > 0){
- flag = false;
- }
- }
- if(flag){
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
- 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()))){
-// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+//// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+//// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+//// }
+// OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),
+// wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme());
+//
+// //淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
+// boolean flag = true;
+//// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
+// Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
+// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+// for(OrderDetl orderDetl : orderDetls){
+// if(orderDetl.getWorkQty() > 0){
+// flag = false;
// }
- OrderInAndOutUtil.updateOrder(Boolean.FALSE,order.getId(),order.getSettle(),userId);
- }
- }
+// }
+// if(flag){
+//// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
+// 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()))){
+//// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+//// }
+// OrderInAndOutUtil.updateOrder(Boolean.FALSE,order.getId(),order.getSettle(),userId);
+// }
+// }
}
}
@@ -1594,6 +1622,63 @@
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
+ }
+
+ /**
+ * 鍑哄簱浠诲姟鍙栨秷鏃跺洖婊氬嚭搴撹鍗曟槑缁嗙殑浠诲姟鐢熸垚鏁伴噺銆�
+ *
+ * 寤惰繜鍑哄簱璁㈠崟涓細
+ * - work_qty 琛ㄧず宸茬粡鐢熸垚浠诲姟鐨勬暟閲忥紱
+ * - qty 琛ㄧず宸茬粡瀹屾垚鍑哄簱鐨勬暟閲忋��
+ *
+ * WCS 鍙栨秷鎴栨湰鍦板彇娑堜换鍔″悗锛屼换鍔′細琚Щ鍏ュ巻鍙叉。骞跺垹闄ゅ綋鍓嶅伐浣滄。銆�
+ * 濡傛灉涓嶅洖婊� work_qty锛屽悗缁悓涓�璁㈠崟鍐嶆涓嬪彂鏃剁郴缁熶細璇涓鸿繖浜涙槑缁嗕粛宸茬敓鎴愪换鍔°��
+ */
+ private void rollbackPakoutOrderWorkQty(WrkMast wrkMast, List<WrkDetl> wrkDetls, Long userId, Date now) {
+ if (wrkMast == null || Cools.isEmpty(wrkDetls)) {
+ return;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl == null || Cools.isEmpty(wrkDetl.getOrderNo())) {
+ continue;
+ }
+ OrderDetlPakout orderDetl = findPakoutOrderDetlForRollback(wrkMast, wrkDetl);
+ if (orderDetl == null) {
+ continue;
+ }
+ double oldWorkQty = safeDouble(orderDetl.getWorkQty());
+ double rollbackQty = safeDouble(wrkDetl.getAnfme());
+ double completedQty = safeDouble(orderDetl.getQty());
+ double newWorkQty = Math.max(completedQty, oldWorkQty - rollbackQty);
+ orderDetl.setWorkQty(newWorkQty);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ if (!orderDetlPakoutService.updateById(orderDetl)) {
+ throw new CoolException("鍑哄簱浠诲姟鍙栨秷鍥炴粴璁㈠崟鏄庣粏浣滀笟鏁伴噺澶辫触锛�" + wrkDetl.getOrderNo());
+ }
+ }
+ }
+
+ private OrderDetlPakout findPakoutOrderDetlForRollback(WrkMast wrkMast, WrkDetl wrkDetl) {
+ String palletId = null;
+ if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getZpallet())) {
+ palletId = wrkDetl.getZpallet();
+ } else if (wrkMast != null) {
+ palletId = wrkMast.getBarcode();
+ }
+ if (!Cools.isEmpty(palletId)) {
+ OrderDetlPakout orderDetl = orderDetlPakoutService.selectItemByOrderNoAndPallet(wrkDetl.getOrderNo(), palletId);
+ if (orderDetl != null) {
+ return orderDetl;
+ }
+ }
+ return orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ }
+
+ private double safeDouble(Double value) {
+ return value == null ? 0.0D : value;
}
@Override
@@ -1786,3 +1871,4 @@
}
}
+
--
Gitblit v1.9.1