From 2b13134f6e3bd5997c0424c0ba9fd7aa460ea1d2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 10 一月 2025 11:43:59 +0800
Subject: [PATCH] 优化定时任务间隔及字段命名，调整环境配置
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 f0a2001..52244bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -24,9 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -252,7 +251,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -271,7 +270,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -461,7 +460,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -480,7 +479,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -517,7 +516,7 @@
null // 澶囨敞
);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鎵撳寘澶辫触");
}
Mat mat = matService.selectByMatnr(analyse.getMatnr());
@@ -553,7 +552,7 @@
null // 澶囨敞
);
if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
// 浜岀骇鍒嗙被
@@ -582,7 +581,7 @@
null // 澶囨敞
);
if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
tagId = secTag.getId();
@@ -598,7 +597,7 @@
mat.setCreateTime(now);
mat.setUpdateTime(now);
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鐗╂枡娣诲姞澶辫触");
} else {
log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
}
@@ -886,6 +885,11 @@
}
Date now = new Date();
Order order = orderMapping(param, now, pakin, docName);
+ Set<String> set = new HashSet<>();
+ for (OrderSyncParam.OrderDetl child : param.getChildren()) {
+ set.add(child.getCDefine22());
+ }
+ order.setTel(JSON.toJSONString(set));
orderService.insert(order);
param.getChildren().forEach(od -> {
OrderDetl orderDetl = orderDetlMapping(order, od, now);
@@ -984,7 +988,9 @@
order.setDefNumber(param.get鎿嶄綔绯荤粺鍙�());
+ order.setCreateBy(9999L);
order.setCreateTime(now);
+ order.setUpdateBy(9999L);
order.setUpdateTime(now);
order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
@@ -1021,7 +1027,11 @@
//閿�鍞鍗曞彿
od.setThreeCode(odParam.getCDefine22());
//鑷敱椤�
- od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
+ od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ }
+ od.setWeight(odParam.getINum());
+ od.setVolume(odParam.getIinvexchrate());
//IDs
od.setSku(odParam.getId());
@@ -1030,6 +1040,7 @@
od.setSource(order.getDocType().intValue());
od.setStatus(1);
od.setQty(0.0D);
+ od.setReportQty(0.0D);
od.setCreateBy(9999L);
od.setCreateTime(now);
od.setUpdateBy(9999L);
--
Gitblit v1.9.1