From 2d68b0241edf83823bedba2392b81c9f0957a7d3 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 16:43:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs
---
src/main/java/com/zy/common/web/WcsController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 473c209..34d9402 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -96,6 +96,12 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+ try {
+ // 寤惰繜 3 绉掑啀妫�娴�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
@@ -373,7 +379,7 @@
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
// wrkDetl.setLuHao(orderDetl.getLuHao());
- wrkDetl.setWeight(wrkMast.getScWeight());
+ wrkDetl.setWeight(weight);
wrkDetl.setPacking(orderDetl.getPacking());
wrkDetl.setColor(orderDetl.getColor());
wrkDetl.setWareId(orderDetl.getWareId());
--
Gitblit v1.9.1