From 19feb4af89f6e5e67c3dc97cbbcf6cfc40350781 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 07 二月 2026 15:02:55 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 c75f761..85b36dd 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,13 @@
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.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -74,6 +65,8 @@
private String port;
@Value("${kopen.prefix}")
private String prefix;
+ @Autowired
+ private BasAreasService basAreasService;
/**
@@ -128,6 +121,7 @@
if (!Objects.isNull(code) && code.equals(200)) {
if (!Objects.isNull(order)) {
order.setReportOnce(5);
+ order.setSettle(6L);
orderService.updateById(order);
}
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
@@ -563,16 +557,13 @@
if (Objects.isNull(params) || params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
- Set<String> collect = params.stream().map(PageRequestParams::getPro_id).collect(Collectors.toSet());
-
- Set<String> komccodes = params.stream().map(PageRequestParams::getPro_komcode).collect(Collectors.toSet());
-
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- wrapper.in(collect.isEmpty(), "pro_id", collect);
- wrapper.in(komccodes.isEmpty(), "komccode", komccodes);
-
- List<LocDetl> detls = locDetlService.selectList(wrapper);
+ 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();
@@ -585,11 +576,17 @@
} 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("barcode", item.getZpallet()));
+ if (!Objects.isNull(barcode)) {
+ BasAreas areas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("id", barcode.getAreaId()));
+ if (!Objects.isNull(areas)) {
+ locDetlDto.setLocation_no(areas.getName());
+ }
}
locDetlDto
.setPro_komcode(item.getMatnr())
@@ -752,11 +749,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(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce++;
+ order.setReportOnce(reportOnce);
+ orderService.updateById(order);
+ }
return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
JSONObject jsonObject = JSONObject.parseObject(response);
--
Gitblit v1.9.1