From 38242a15bc0a93933857018e7caf7c6ec41ee652 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 18:25:21 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 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 99dcfe4..f37a826 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -82,12 +82,12 @@
* @date 2025/11/24 14:49
*/
@Override
- public XSR receiveOrders(List<PubOrderParams> orderParams) {
+ public XSR receiveOrders(List<PubOrderParams> orderParams, String type) {
orderParams.forEach(params -> {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
throw new CoolException("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
@@ -128,7 +128,7 @@
} else {
if (!Objects.isNull(order)) {
int reportOnce = order.getReportOnce();
- reportOnce ++;
+ reportOnce++;
order.setReportOnce(reportOnce);
orderService.updateById(order);
}
@@ -138,7 +138,7 @@
} catch (Exception e) {
if (!Objects.isNull(order)) {
int reportOnce = order.getReportOnce();
- reportOnce ++;
+ reportOnce++;
order.setReportOnce(reportOnce);
orderService.updateById(order);
}
@@ -149,9 +149,10 @@
/**
* 鑾峰彇鑷畾涔夎姹傚ご
+ *
+ * @return java.util.Map<java.lang.String, java.lang.Object>
* @author Ryan
* @date 2025/12/29 9:11
- * @return java.util.Map<java.lang.String,java.lang.Object>
*/
private Map<String, Object> getHeaderParam() {
Map<String, Object> headerParam = new HashMap<>();
@@ -179,7 +180,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams) {
+ public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams, String type) {
if (Objects.isNull(pubOrderParams) || pubOrderParams.isEmpty()) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -195,7 +196,7 @@
throw new CoolException("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
@@ -264,7 +265,12 @@
if (Objects.isNull(mats.getPro_type())) {
throw new CoolException("闆朵欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", mats.getPro_komcode()));
+ if (Objects.isNull(mats.getPro_id())) {
+ throw new CoolException("渚涘簲鍟嗕笉鑳戒负绌猴紒锛�");
+ }
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>()
+ .eq("supp_code", mats.getPro_id())
+ .eq("matnr", mats.getPro_komcode()));
if (!Objects.isNull(matnr)) {
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(mats.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
@@ -354,8 +360,11 @@
// 鍒ゆ柇璁㈠崟鏄惁瀛樺湪
if (Objects.isNull(order)) {
/** 涓嶅瓨鍦紝鏂板璁㈠崟 */
- generateOrders(params);
+ generateOrders(params, type);
} else {
+ if (order.getSettle() == 2) {
+ throw new CoolException("璁㈠崟宸插鐞嗭紝涓嶅彲鍐嶅彉鏇达紒锛�");
+ }
/** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
// 鍒犻櫎鏃ц鍗曟槑缁�
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
@@ -365,7 +374,7 @@
if (!orderService.deleteById(order.getId())) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
- generateOrders(params);
+ generateOrders(params, type);
}
}
@@ -377,9 +386,10 @@
* 鐢熸垚璁㈠崟淇℃伅
*
* @param params
+ * @param type
*/
@Transactional(rollbackFor = Exception.class)
- public void generateOrders(PubOrderParams params) {
+ public void generateOrders(PubOrderParams params, String type) {
// 灏嗘暟鎹綋鏂拌鍗曟彃鍏�
Order newOrder = new Order();
// 娲惧伐鍗曞彿
@@ -440,7 +450,11 @@
if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
// 鍏ュ簱
- orderItem.setAnfme(Math.round(item.getInv_qty() * 10000) / 10000.0);
+ if (type.equals("add")) {
+ orderItem.setAnfme(Math.round(item.getInv_qty() * 10000) / 10000.0);
+ } else {
+ orderItem.setAnfme(Math.round(item.getNew_qty() * 10000) / 10000.0);
+ }
} else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
// 鍑哄簱
if (OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
@@ -449,7 +463,11 @@
} else if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
|| OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType())) {
// 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
- orderItem.setAnfme(Math.round(item.getOrder_qty() * 10000) / 10000.0);
+ if (type.equals("add")) {
+ orderItem.setAnfme(Math.round(item.getOrder_qty() * 10000) / 10000.0);
+ } else {
+ orderItem.setAnfme(Math.round(item.getNew_qty() * 10000) / 10000.0);
+ }
}
}
orderItem.setMatnr(matnr.getMatnr());
@@ -538,18 +556,18 @@
wrapper.eq("matnr", params.getPro_komcode());
}
- Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), wrapper);
+ Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), wrapper);
return XSR.ok(locDetls.getRecords());
}
/**
* 闆朵欢鎹熸孩鍗曚笅鍙�
- *
- * @author Ryan
- * @date 2025/11/24 15:22
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2025/11/24 15:22
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -566,11 +584,12 @@
/**
* 鎹熸孩鍗曞畬缁撲笂鎶�
- * @author Ryan
- * @date 2025/12/30 16:57
+ *
* @param params
* @param order
* @return com.zy.api.entity.dto.XSR
+ * @author Ryan
+ * @date 2025/12/30 16:57
*/
@Override
public XSR reportCheckOrder(List<StockAdjustParams> params, CheckOrder order) {
@@ -589,22 +608,22 @@
if (Objects.isNull(response) || response.trim().isEmpty()) {
return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
- JSONObject jsonObject = JSONObject.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (!Objects.isNull(code) && code.equals(200)) {
-// if (!Objects.isNull(order)) {
-// order.setReportOnce(5);
-// orderService.updateById(order);
-// }
+ XSR jsonObject = JSONObject.parseObject(response, XSR.class);
+ if (jsonObject.getSuccess()) {
+ if (!Objects.isNull(order)) {
+ order.setReportOnce(5);
+ order.setSettle(5L);
+ checkOrderService.updateById(order);
+ }
return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
} else {
-// if (!Objects.isNull(order)) {
-// int reportOnce = order.getReportOnce();
-// reportOnce ++;
-// order.setReportOnce(reportOnce);
-// orderService.updateById(order);
-// }
- String msg = jsonObject.getString("message");
+ if (!Objects.isNull(order)) {
+ int reportOnce = order.getReportOnce();
+ reportOnce++;
+ order.setReportOnce(reportOnce);
+ checkOrderService.updateById(order);
+ }
+ String msg = jsonObject.getMessage();
return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
}
} catch (Exception e) {
@@ -622,6 +641,7 @@
/**
* 澶囪揣鍗曞弽棣�
+ *
* @param params
* @param order
* @return
@@ -654,7 +674,7 @@
} else {
if (!Objects.isNull(order)) {
int reportOnce = order.getReportOnce();
- reportOnce ++;
+ reportOnce++;
order.setReportOnce(reportOnce);
orderService.updateById(order);
}
@@ -664,7 +684,7 @@
} catch (Exception e) {
if (!Objects.isNull(order)) {
int reportOnce = order.getReportOnce();
- reportOnce ++;
+ reportOnce++;
order.setReportOnce(reportOnce);
orderService.updateById(order);
}
@@ -673,9 +693,12 @@
}
}
- /** 鐢熸垚鏂扮殑闆朵欢鎹熸孩鍗�
- * @param userId */
- @Transactional(rollbackFor = Exception.class)
+ /**
+ * 鐢熸垚鏂扮殑闆朵欢鎹熸孩鍗�
+ *
+ * @param userId
+ */
+ @Transactional(rollbackFor = Exception.class)
public void gentCheckOrders(StockAdjustParams params, Long userId) {
if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
throw new CoolException("璁㈠崟鏄庣粏涓嶈兘涓虹┖锛侊紒");
--
Gitblit v1.9.1