From c45d612c0673c5037a12b4a7514b5c52e7ecdbe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 11:14:03 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++++-
1 files changed, 5 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 f0a2001..d693b49 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1021,7 +1021,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());
--
Gitblit v1.9.1