From 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 08:28:08 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 146 +++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 87 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 5456a63..9fa3537 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -11,7 +11,6 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -31,9 +30,13 @@
public class OpenServiceImpl implements OpenService {
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -67,13 +70,13 @@
public void pakinOrderCreate(OpenOrderPakinParam param) {
callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order) && order.getSettle() != 1) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸叉湁宸ヤ綔浠诲姟");
}
if (!Cools.isEmpty(order)) {
- boolean orderNo = orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
- boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", param.getOrderNo()));
+ boolean orderNo = orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
+ boolean orderNo1 = orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", param.getOrderNo()));
}
DocType docType;
@@ -120,8 +123,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
- if (!orderService.insert(order)) {
+ if (!orderPakinService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
@@ -144,7 +146,7 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ OrderDetlPakin orderDetlPakout = new OrderDetlPakin();
orderDetlPakout.sync(mat);
orderDetlPakout.setBatch(detlDto.getBatch());
orderDetlPakout.setAnfme(detlDto.getAnfme());
@@ -167,7 +169,7 @@
orderDetlPakout.setTemp3(detlDto.getTemp3());
orderDetlPakout.setTemp4(detlDto.getTemp4());
orderDetlPakout.setInspect(detlDto.getQuality());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakinService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -176,43 +178,43 @@
@Override
@Transactional
public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
- callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
+ callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.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<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectByOrderId(order.getId());
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
}
} else {
// 鎵�鏈夎鍗�
- List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
+ List<OrderPakin> orders = orderPakinService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
for (OrderPakin order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectByOrderId(order.getId());
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -224,13 +226,13 @@
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderService.remove(order.getId());
+ orderPakoutService.remove(order.getId());
}
DocType docType;
if (param.getOrderType().equals("璋冩嫧鍗�")) {
@@ -240,7 +242,7 @@
}
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new OrderPakin(
+ order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
param.getInboundDate(), // 鍗曟嵁鏃ユ湡
@@ -277,7 +279,7 @@
null // 澶囨敞
);
order.setShipCode(param.getQuality());
- if (!orderService.insert(order)) {
+ if (!orderPakoutService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
@@ -322,7 +324,7 @@
orderDetlPakout.setTemp2(detlDto.getTemp2());
orderDetlPakout.setTemp3(detlDto.getTemp3());
orderDetlPakout.setTemp4(detlDto.getTemp4());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakoutService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -333,39 +335,39 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.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<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
}
} else {
// 鎵�鏈夎鍗�
- List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
- for (OrderPakin order : orders) {
+ List<OrderPakout> orders = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().eq("settle", 4L));
+ for (OrderPakout order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -378,7 +380,6 @@
public List<StockVo> queryStock() {
return locDetlService.queryStockTotal();
}
-
@Override
@@ -490,35 +491,6 @@
}
}
-
- //Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
-// if (tag == null) {
-// throw new CoolException("鍑洪敊锛屾湭鎵惧埌鍒嗙被");
-// }
-// if (mat == null) {
-// mat = new Mat();
-// mat.sync(matParam);
-//// mat.setMatnr(param.getMatnr());
-//// mat.setMaktx(param.getMaktx());
-//// mat.setSpecs(param.getSpecs());
-//// mat.setModel(param.getModel());
-//
-// mat.setTagId(tag.getId());
-// mat.setStatus(1);
-// mat.setCreateTime(now);
-// mat.setUpdateTime(now);
-// if (!matService.insert(mat)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// } else {
-// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
-// }
-// } else {
-// mat.sync(matParam);
-// mat.setTagId(tag.getId());
-// if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
-// throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
}
}
@@ -539,7 +511,7 @@
if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
if (!Cools.isEmpty(wrkDetlLog.getOrderNo())) {
- OrderPakin order = orderService.selectByNo(wrkDetlLog.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(wrkDetlLog.getOrderNo());
if (!Cools.isEmpty(order)) {
locDetlByTimeDTO.setDate(order.getOrderTime());
locDetlByTimeDTO.setWarehouse(order.getItemName());
@@ -560,26 +532,6 @@
}
});
-// if (!Cools.isEmpty(locDetls)) {
-// for (LocDetl locDetl : locDetls) {
-//
-// if (!Cools.isEmpty(locDetl.getOrderNo())){
-// Order order = orderService.selectByNo(locDetl.getOrderNo());
-// if (!Cools.isEmpty(order)) {
-// locDetlByTimeDTO.setDate(order.getOrderTime());
-// locDetlByTimeDTO.setWarehouse(order.getItemName());
-// locDetlByTimeDTO.setOrderType(order.getDocType().toString());
-// }
-// }
-//
-// locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
-// locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
-// locDetlByTimeDTO.setBatch(locDetl.getBatch());
-// locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
-// locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
-// locDetlByTimeDTOS.add(locDetlByTimeDTO);
-// }
-// }
return locDetlByTimeDTOS;
}
@@ -725,18 +677,38 @@
@Transactional
@Override
- public void orderDelete(String orderNo) {
- OrderPakin order = orderService.selectByNo(orderNo);
+ public void orderPakinDelete(String orderNo) {
+ OrderPakin order = orderPakinService.selectByNo(orderNo);
if (order == null) {
throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
}
if (order.getSettle() != 1) {
throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
}
- List<OrderDetlPakout> OrderDetlPakout = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ List<OrderDetlPakout> OrderDetlPakout = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
if (!Cools.isEmpty(OrderDetlPakout)) {
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderNo));
}
- orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+
+
+ }
+
+ @Transactional
+ @Override
+ public void orderPakoutDelete(String orderNo) {
+
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
+ if (orderPakout == null) {
+ throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
+ }
+ if (orderPakout.getSettle() != 1) {
+ throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
+ }
+ List<OrderDetlPakout> orderDetlPakins = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ if (!Cools.isEmpty(orderDetlPakins)) {
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ }
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
}
}
--
Gitblit v1.9.1