From 6efbf154b3ed88d376763b9d9807256c7bd5eaeb Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 09 三月 2026 20:23:38 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 168 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 107 insertions(+), 61 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 dbf3c3a..f4226db 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -9,10 +9,11 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.enums.CheckStatusEnum;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -49,17 +50,24 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private CheckOrderService checkOrderService;
+ @Autowired
+ private CheckOrderDetlService checkOrderDetlService;
+
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
-
- OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
-
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- Order order = new Order(
+ order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -95,9 +103,9 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
-
- OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);
-
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
@@ -128,7 +136,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
}
@@ -138,54 +148,41 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
-// Order order = orderService.selectByNo(param.getOrderNo());
-
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,param.getOrderNo());
-
+ Order order = orderService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectBySettle(4L);
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
- orders = new ArrayList<>();
- }
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
-
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
return results;
@@ -194,15 +191,13 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
-// Order order = orderService.selectByNo(param.getOrderNo());
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
-// orderService.remove(order.getId());
- OrderInAndOutUtil.remove(Boolean.FALSE,order.getId());
+ orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
@@ -243,10 +238,9 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
-// if (!orderService.insert(order)) {
-// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- OrderInAndOutUtil.insertOrder(Boolean.FALSE,order);
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
@@ -277,10 +271,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
-// if (!orderDetlService.insert(orderDetl)) {
-// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- OrderInAndOutUtil.insertOrderDetl(Boolean.FALSE,order,orderDetl);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
}
@@ -289,47 +282,41 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
-// Order order = orderService.selectByNo(param.getOrderNo());
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
return results;
@@ -456,6 +443,65 @@
}
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void adjustmentOrderCreate(OpenAdjustmentOrderParam param) {
+ if(Cools.isEmpty(param.getOrderNo())){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getOrderNo());
+ if(!Cools.isEmpty(docType)){
+ prefix = "Adjust";
+ }
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ }
+ CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", param.getOrderNo()) );
+ if (checkOrder != null) {
+ throw new CoolException("鍗曟嵁宸插瓨鍦�");
+ }
+ Date now = new Date();
+ checkOrder = new CheckOrder();
+ checkOrder.setOrderNo(param.getOrderNo());
+ checkOrder.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ checkOrder.setOrderTime( DateUtils.convert(now));
+ checkOrder.setDocType(Long.valueOf(OrderTypeEnum.ADJUSTMENT.type));
+ checkOrder.setSettle(1L);
+ checkOrder.setCreateBy(9527L);
+ checkOrder.setCreateTime(now);
+ checkOrder.setUpdateBy(9527L);
+ checkOrder.setUpdateTime(now);
+ checkOrder.setStatus(1);
+
+ if (!checkOrderService.insert(checkOrder)) {
+ throw new CoolException("淇濆瓨璋冩暣鍗曚富鍗曞け璐�");
+ }
+ for (CheckOrderDetl checkOrderDetl1 : param.getOrderDetails()) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("matnr", checkOrderDetl1.getMatnr())
+ .eq("loc_no", checkOrderDetl1.getLocNo())
+ .eq("batch", checkOrderDetl1.getBatch())
+ );
+ if (Cools.isEmpty(locDetl)) {
+ throw new CoolException("鏈壘鍒板簱瀛樻槑缁�,璇锋鏌ュ簱瀛�");
+ }
+ CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
+ checkOrderDetl.sync(locDetl);
+ checkOrderDetl.setLocDetlId(locDetl.getId());
+ checkOrderDetl.setOrderId(checkOrder.getId());
+ checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
+ checkOrderDetl.setAnfme(checkOrderDetl1.getAnfme());
+ checkOrderDetl.setDiffQty(checkOrderDetl1.getDiffQty());
+ checkOrderDetl.setWorkQty(checkOrderDetl1.getWorkQty());
+ checkOrderDetl.setStatus(checkOrderDetl1.getStatus().equals(1)? CheckStatusEnum.ALLOW.type:CheckStatusEnum.FORBID.type);
+ checkOrderDetl.setZpallet(locDetl.getZpallet());
+ checkOrderDetl.setCreateTime(now);
+ checkOrderDetl.setUpdateTime(now);
+ if (!checkOrderDetlService.insert(checkOrderDetl)) {
+ throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
+ }
+ }
+ }
+
@Override
@Transactional
public void syncMat(MatSyncParam param) {
--
Gitblit v1.9.1