From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 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 87839b2..6044ed0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -77,8 +77,7 @@
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
@@ -156,8 +155,7 @@
}
// 鐢熸垚璋冩嫧鍗�
if (docType.getDocId().intValue() == 32) {
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
"DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
33L, // 鍗曟嵁绫诲瀷
@@ -294,8 +292,7 @@
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
@@ -369,8 +366,7 @@
}
}
if (docType.getDocId().intValue() == 32) {
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
"DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
33L, // 鍗曟嵁绫诲瀷
@@ -509,8 +505,7 @@
throw new CoolException(param.getBarcode() + "閲嶅鎻愪氦");
}
Date now = new Date();
- pack = new Pack(
- param.getBarcode(), // 鏉＄爜[闈炵┖]
+ pack = new Pack(param.getBarcode(), // 鏉＄爜[闈炵┖]
analyse.getMatnr(), // 鐗╂枡鍙�
analyse.getBarcode(), // 搴忓垪鐮�
1L, // 璁㈠崟鐘舵��
@@ -537,8 +532,7 @@
Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
+ priTag = new Tag(null, // 缂栧彿
param.getGroupCode(), // 鍚嶇О
top.getId(), // 鐖剁骇
top.getName(), // 鐖剁骇鍚嶇О
@@ -567,8 +561,7 @@
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
+ secTag = new Tag(null, // 缂栧彿
param.getGroupName(), // 鍚嶇О
priTag.getId(), // 鐖剁骇
priTag.getName(), // 鐖剁骇鍚嶇О
@@ -655,6 +648,7 @@
mat.setBeBatch(Cools.eq("true", param.getBInvBatch()) ? 1 : 0);
mat.setStatus(param.getStates());
+ mat.setModel(param.getIGroupType());//0:鏃犳崲绠� 1锛氬浐瀹氭崲绠� 2锛氭诞鍔ㄦ崲绠� 涓嶆槸0鐨勯兘寰椾紶 榛樿涓�0
mat.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
mat.setCreateTime(date);
mat.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -664,9 +658,7 @@
}
public void callApiLogSave(Mat mat, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1",
- "鐗╂枡缂栫爜锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佽鏍硷細" + mat.getSpecs() + "銆佸娉細" + mat.getMemo(),
- response, bool);
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1", "鐗╂枡缂栫爜锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佽鏍硷細" + mat.getSpecs() + "銆佸娉細" + mat.getMemo(), response, bool);
}
@@ -683,8 +675,7 @@
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
callApiLogSaveMES(param, null, param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱", false);
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
@@ -745,17 +736,11 @@
public void callApiLogSaveMES(CombParam combParam, CombParam.CombMat combMat, String response, Boolean bool) {
if (Cools.isEmpty(combParam)) {
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "",
- response, bool);
+ apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1", "", response, bool);
} else if (Cools.isEmpty(combMat)) {
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "鎵樼洏鐮侊細" + combParam.getBarcode(),
- response, bool);
+ apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1", "鎵樼洏鐮侊細" + combParam.getBarcode(), response, bool);
} else {
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "鎵樼洏鐮侊細" + combParam.getBarcode() + "銆佺墿鏂欑紪鍙凤細" + combMat.getMatnr() + "銆佹暟閲忥細" + combMat.getAnfme(),
- response, bool);
+ apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1", "鎵樼洏鐮侊細" + combParam.getBarcode() + "銆佺墿鏂欑紪鍙凤細" + combMat.getMatnr() + "銆佹暟閲忥細" + combMat.getAnfme(), response, bool);
}
}
@@ -901,6 +886,11 @@
}
Date now = new Date();
Order order = orderMapping(param, now, pakin, docName);
+ StringBuffer tel = new StringBuffer();
+ for (OrderSyncParam.OrderDetl child : param.getChildren()) {
+ tel.append(child.getCDefine22()).append(";");
+ }
+ order.setTel(tel.toString());
orderService.insert(order);
param.getChildren().forEach(od -> {
OrderDetl orderDetl = orderDetlMapping(order, od, now);
@@ -999,9 +989,11 @@
order.setDefNumber(param.get鎿嶄綔绯荤粺鍙�());
+ order.setCreateBy(9999L);
order.setCreateTime(now);
+ order.setUpdateBy(9999L);
order.setUpdateTime(now);
-
+ order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
order.setSettle(1L);
//鐘舵��
@@ -1036,7 +1028,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());
@@ -1045,6 +1041,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);
@@ -1063,14 +1060,11 @@
public void callApiLogSave(MatInfoParam matParam, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1",
- "鐗╂枡缂栫爜锛�" + matParam.getCinvcode() + "銆佺墿鏂欏悕绉帮細" + matParam.getCinvname() + "銆佽鏍硷細" + matParam.getCInvStd() + "銆佸娉細" + matParam.getMemo(),
- response, bool);
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1", "鐗╂枡缂栫爜锛�" + matParam.getCinvcode() + "銆佺墿鏂欏悕绉帮細" + matParam.getCinvname() + "銆佽鏍硷細" + matParam.getCInvStd() + "銆佸娉細" + matParam.getMemo(), response, bool);
}
public void callApiLogSave(OrderSyncParam param, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP璁㈠崟鍚屾", tableName, "null", "10.10.10.1",
- param.toString(), response, bool);
+ apiLogService.save("ERP璁㈠崟鍚屾", tableName, "null", "10.10.10.1", param.toString(), response, bool);
}
public static void main(String[] args) {
--
Gitblit v1.9.1