From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 151 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 113 insertions(+), 38 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 f10fdb8..855846b 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -15,27 +15,22 @@
import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
+import com.zy.api.entity.dto.LocDetlDto;
import com.zy.api.entity.dto.XSR;
import com.zy.api.enums.MatLocType;
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.service.impl.OrderPakoutServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -47,6 +42,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service("kopenApiServiceImpl")
@@ -72,6 +68,16 @@
private String port;
@Value("${kopen.prefix}")
private String prefix;
+ @Autowired
+ private BasAreasService basAreasService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
/**
@@ -126,6 +132,7 @@
if (!Objects.isNull(code) && code.equals(200)) {
if (!Objects.isNull(order)) {
order.setReportOnce(5);
+ order.setSettle(6L);
orderService.updateById(order);
}
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
@@ -201,7 +208,6 @@
if (Objects.isNull(params.getCompany_id())) {
throw new CoolException("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
-
addOrUpdateOrders(params, type);
});
@@ -370,19 +376,49 @@
/** 涓嶅瓨鍦紝鏂板璁㈠崟 */
generateOrders(params, type);
} else {
- if (order.getSettle() == 2) {
- throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
- }
- /** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
- // 鍒犻櫎鏃ц鍗曟槑缁�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+ // 鍏ュ簱
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
+ if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
+ throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
+ }
+ /** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
+ if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+ // 鍑哄簱
+ if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
+ || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType()) ||
+ OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
+ // 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
+ OrderPakout orderPakin = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", order.getOrderNo()));
+ if (!Objects.isNull(orderPakin) && orderPakin.getSettle() != 1) {
+ throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
+ }
+
+ /** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
+ if (!orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakin.getOrderNo()))) {
+ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ throw new CoolException("鍗曟嵁绫诲瀷涓嶅瓨鍦紝涓嶆敮鎸佹坊鍔狅紒锛�");
+ }
}
- if (!orderService.deleteById(order.getId())) {
+ order.setSettle(3L);
+ if (!orderService.updateById(order)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
- generateOrders(params, type);
+// generateOrders(params, type);
}
}
@@ -425,7 +461,8 @@
}
newOrder.setPakinPakoutStatus(2);
}
-
+ //鍗曟嵁绫诲瀷
+ newOrder.setShipName(type);
newOrder.setUuid(generateUUID(params));
// 娴佹按鍙凤紙鍞竴锛�
newOrder.setDefNumber(params.getKopen_id());
@@ -447,7 +484,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("鐗╂枡缂栫爜涓嶅瓨鍦紒锛�");
}
@@ -557,18 +596,48 @@
* @return com.core.common.R
*/
@Override
- public XSR getStockInfo(PageRequestParams params) {
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- if (!Objects.isNull(params.getPro_id())) {
- wrapper.eq("supp_code", params.getPro_id());
+ public XSR getStockInfo(List<PageRequestParams> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (!Objects.isNull(params.getPro_komcode())) {
- wrapper.eq("matnr", params.getPro_komcode());
+ List<LocDetl> detls = new ArrayList<>();
+ params.forEach(param -> {
+ List<LocDetl> selectList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("supp_code", param.getPro_id()).eq("matnr", param.getPro_komcode()));
+ if (selectList != null && !selectList.isEmpty()) {
+ detls.addAll(selectList);
+ }
+ });
+
+ if (detls == null || detls.isEmpty()) {
+ return XSR.ok();
}
-
- Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), wrapper);
-
- return XSR.ok(locDetls.getRecords());
+ List<LocDetlDto> dtos = new ArrayList<>();
+ detls.forEach(item -> {
+ LocDetlDto locDetlDto = new LocDetlDto();
+ if (item.getDiffQty().compareTo(BigDecimal.ZERO) == 0) {
+ locDetlDto.setLock_qty(0);
+ } else {
+ locDetlDto.setLock_qty(Integer.parseInt(item.getDiffQty().toString()));
+ }
+ if (item.getBookQty().compareTo(BigDecimal.ZERO) == 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());
+ dtos.add(locDetlDto);
+ });
+ return XSR.ok(dtos);
}
/**
@@ -722,11 +791,17 @@
try {
response = new HttpHandler.Builder()
.setUri(url + ":" + port)
- .setPath(prefix + "/getOutDetailsResult")
+ .setPath(prefix + "/getOutDispatchResult")
.setJson(JSONObject.toJSONString(orderParams))
.build()
.doPost();
- if (Objects.isNull(response) || response.trim().isEmpty()) {
+ if (Objects.isNull(response) || response.trim().isEmpty()) {
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
JSONObject jsonObject = JSONObject.parseObject(response);
@@ -830,9 +905,9 @@
checkOrderDetl.setStatus(1);
checkOrderDetl.setZpallet(locDetl.getZpallet());
checkOrderDetl.setCreateBy(userId);
- checkOrderDetl.setCreateTime(new Date());
+// checkOrderDetl.setCreateTime(new Date());
checkOrderDetl.setUpdateBy(userId);
- checkOrderDetl.setUpdateTime(new Date());
+// checkOrderDetl.setUpdateTime(new Date());
if (!checkOrderDetlService.insert(checkOrderDetl)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
--
Gitblit v1.9.1