From 1fdb053b64a033280a8ffe0ea10ad54b604e58cd Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 28 二月 2026 16:31:37 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index aa2ecac..92a9120 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -21,22 +21,15 @@
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
import com.zy.api.service.KopenApiService;
-import com.zy.asrs.entity.CheckOrder;
-import com.zy.asrs.entity.CheckOrderDetl;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.OrderSettle;
import com.zy.asrs.enums.OrderTypeEnum;
-import com.zy.asrs.service.CheckOrderDetlService;
-import com.zy.asrs.service.CheckOrderService;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasAreasServiceImpl;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
+import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -74,6 +67,12 @@
private String port;
@Value("${kopen.prefix}")
private String prefix;
+ @Autowired
+ private BasAreasService basAreasService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
/**
@@ -128,6 +127,7 @@
if (!Objects.isNull(code) && code.equals(200)) {
if (!Objects.isNull(order)) {
order.setReportOnce(5);
+ order.setSettle(6L);
orderService.updateById(order);
}
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
@@ -203,7 +203,6 @@
if (Objects.isNull(params.getCompany_id())) {
throw new CoolException("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
-
addOrUpdateOrders(params, type);
});
@@ -372,19 +371,28 @@
/** 涓嶅瓨鍦紝鏂板璁㈠崟 */
generateOrders(params, type);
} else {
- if (order.getSettle() == 2) {
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
+ if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
}
/** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
- // 鍒犻櫎鏃ц鍗曟槑缁�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
}
- if (!orderService.deleteById(order.getId())) {
+ if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ // 鍒犻櫎鏃ц鍗曟槑缁�
+// if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+// throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+// }
+
+ order.setSettle(3L);
+ if (!orderService.updateById(order)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
- generateOrders(params, type);
+// generateOrders(params, type);
}
}
@@ -449,7 +457,9 @@
}
if (!Objects.isNull(params.getDetails()) && !params.getDetails().isEmpty()) {
params.getDetails().forEach(item -> {
- Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", item.getPro_komcode()));
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>()
+ .eq("supp_code", item.getPro_id())
+ .eq("matnr", item.getPro_komcode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鐗╂枡缂栫爜涓嶅瓨鍦紒锛�");
}
@@ -582,17 +592,22 @@
} else {
locDetlDto.setLock_qty(Integer.parseInt(item.getDiffQty().toString()));
}
-
if (item.getBookQty().compareTo(BigDecimal.ZERO) == 0) {
- locDetlDto.setStock_qty(0);
+ locDetlDto.setStock_qty(item.getAnfme().intValue());
} else {
locDetlDto.setStock_qty(Integer.parseInt(item.getBookQty().toString()));
+ }
+ LocDetl barcode = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", item.getZpallet()));
+ if (!Objects.isNull(barcode)) {
+ BasAreas areas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("id", barcode.getAreaId()));
+ if (!Objects.isNull(areas)) {
+ locDetlDto.setTarget_location(areas.getName());
+ }
}
locDetlDto
.setPro_komcode(item.getMatnr())
.setPro_id(item.getStandby1())
- .setLocation_no(item.getZpallet())
- .setTarget_location("");
+ .setLocation_no(item.getZpallet());
dtos.add(locDetlDto);
});
return XSR.ok(dtos);
--
Gitblit v1.9.1