From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/common/web/WcsController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 683c4b3..55d8621 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -175,7 +175,7 @@
}
/**
- * 鍏ㄦ澘鍏ュ簱
+ * 鍏ㄦ澘鍏ュ簱
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
@@ -249,7 +249,6 @@
}
}else if(wrkMast.getStaNo()==209){
testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setChannel(locMast.getChannel());
testMast.setLocNo(locMast.getLocNo());
testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
testMast.setAppeTime(now);
--
Gitblit v1.9.1