From 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 05 六月 2025 15:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 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 d0b0e65..22ac4dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -107,14 +106,16 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setShipCode(param.getQuality());
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
+ List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getMark());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+ , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -144,7 +145,12 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
- orderDetl.setSupp(detlDto.getCustomer());
+ orderDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ orderDetl.setSku(detlDto.getCustomer());
+ orderDetl.setTemp1(detlDto.getTemp1());
+ orderDetl.setTemp2(detlDto.getTemp2());
+ orderDetl.setTemp3(detlDto.getTemp3());
+ orderDetl.setTemp4(detlDto.getTemp4());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -247,14 +253,17 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setShipCode(param.getQuality());
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
+ List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+ , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+ dto.setTemp1(param.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -284,7 +293,12 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
- orderDetl.setSupp(detlDto.getCustomer());
+ orderDetl.setSupp(detlDto.getSuppName());
+ orderDetl.setSku(detlDto.getCustomer());
+ orderDetl.setTemp1(detlDto.getTemp1());
+ orderDetl.setTemp2(detlDto.getTemp2());
+ orderDetl.setTemp3(detlDto.getTemp3());
+ orderDetl.setTemp4(detlDto.getTemp4());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -519,22 +533,24 @@
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
.eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
wrkDetlLogs.forEach(wrkDetlLog -> {
- LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
- if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
- Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
- if (!Cools.isEmpty(order)) {
- locDetlByTimeDTO.setDate(order.getOrderTime());
- locDetlByTimeDTO.setWarehouse(order.getItemName());
- locDetlByTimeDTO.setOrderType(order.getDocType$());
+ if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
+ Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType$());
+ }
+ locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
+ locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
+ locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
+ locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
+ locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
+ locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
+ locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
}
- locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
- locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
- locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
- locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
- locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
- locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
- locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
- locDetlByTimeDTOS.add(locDetlByTimeDTO);
}
});
@@ -705,4 +721,20 @@
}
});
}
+ @Transactional
+ @Override
+ public void orderDelete(String orderNo) {
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
+ }
+ if (order.getSettle() != 1){
+ throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
+ }
+ List<OrderDetl> OrderDetl = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ if (!Cools.isEmpty(OrderDetl)) {
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ orderService.delete(new EntityWrapper<Order>().eq("order_no", orderNo));
+ }
}
--
Gitblit v1.9.1