From ca07b97ea192888b6ec219fd5409517349789b70 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 三月 2025 09:40:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 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 d4d9dc7..c2d19b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -114,7 +114,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
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,8 +145,12 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
- orderDetl.setSupp(detlDto.getSuppName());
+ 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("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -255,7 +260,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
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());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -287,6 +293,10 @@
orderDetl.setManu(detlDto.getMark());
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("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -518,25 +528,31 @@
// wrkMastLogEntityWrapper.isNotNull("sheet_no");
wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
- .eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
+ EntityWrapper<WrkDetlLog> wrkDetlLogEntityWrapper = new EntityWrapper<>();
+ wrkDetlLogEntityWrapper.eq("wrk_no", wrkMastLog.getWrkNo());
+ if (wrkMastLog.getIoType() != 300 && wrkMastLog.getIoType() != 301){
+ wrkDetlLogEntityWrapper.eq("zpallet", wrkMastLog.getBarcode());
+ }
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(wrkDetlLogEntityWrapper);
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);
}
});
@@ -707,4 +723,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