From 1b230d7961b2d5068298f0cba13287cabd2fd649 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 17 七月 2024 18:47:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 5cc5352..ee7d186 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -100,39 +100,15 @@
}
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
- boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1;
- boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1;
- boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",orderNo)) < 1;
+ int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no",orderNo)) < 1;
+ boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().like("order_no",orderNo)) < 1;
ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
- boolean manPakoutExist = Cools.isEmpty(manPakOut) || manPakOut.getPayment() == 1;
+ boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
-
- // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (null != docType && docType.getPakout() == 1) {
-// // 閲嶇粍鏄庣粏
-// if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
-// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
-// }
-// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
-// for (WrkDetl wrkDetl : wrkDetls) {
-// OrderDetl orderDetl = new OrderDetl();
-// orderDetl.sync(wrkDetl);
-// orderDetl.setQty(orderDetl.getAnfme());
-// orderDetl.setOrderId(order.getId());
-// orderDetl.setOrderNo(orderNo);
-// orderDetl.setStatus(1);
-// orderDetl.setCreateTime(order.getCreateTime());
-// orderDetl.setCreateBy(order.getCreateBy());
-// orderDetl.setUpdateTime(order.getUpdateTime());
-// orderDetl.setUpdateBy(order.getUpdateBy());
-// if (!orderDetlService.insert(orderDetl)) {
-// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
-// }
-// }
-// }
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
--
Gitblit v1.9.1