From 849409866c1372f5daf7becf9aec054922e260b2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 14 二月 2025 13:20:23 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 52244bc..db118c7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -854,6 +854,12 @@
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
+ if ("閾跺骇鐢熶骇閫�鏂欑敵璇峰崟".equalsIgnoreCase(docName)) {
+ if (Cools.isEmpty(param.getBackOrderNo())){
+ throw new CoolException("閫�鏂欏崟鐨勯��鏂欑紪鍙穊ackOrderNo涓嶈兘涓虹┖");
+ }
+ }
+
Order orderOld = null;
if (!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))) {
@@ -992,6 +998,7 @@
order.setCreateTime(now);
order.setUpdateBy(9999L);
order.setUpdateTime(now);
+ order.setSalesman(param.getBackOrderNo());
order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
order.setSettle(1L);
@@ -1026,9 +1033,10 @@
od.setAnfme(odParam.getIQuantity());
//閿�鍞鍗曞彿
od.setThreeCode(odParam.getCDefine22());
+ od.setDevNo(odParam.getDevNo());
//鑷敱椤�
if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
- od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ od.setBrand((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
}
od.setWeight(odParam.getINum());
od.setVolume(odParam.getIinvexchrate());
--
Gitblit v1.9.1