From 4762a3b013f83a7c24fcceedb2a8c09b7fc33dbd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 21 十月 2024 15:56:53 +0800
Subject: [PATCH] 知道组盘点托盘码

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    4 ++--
 src/main/java/com/zy/asrs/entity/param/KxlhcdwcParam.java   |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/KxlhcdwcParam.java b/src/main/java/com/zy/asrs/entity/param/KxlhcdwcParam.java
index 8af1ce5..1a790c9 100644
--- a/src/main/java/com/zy/asrs/entity/param/KxlhcdwcParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/KxlhcdwcParam.java
@@ -18,4 +18,7 @@
     // 缁勭洏绔欑偣
     private Integer site;
 
+    // 缁勭洏绔欑偣鎵樼洏鐮�
+    private String barcode;
+
 }
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 94221a5..2791178 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1726,7 +1726,7 @@
     @Override
     public R kxlhCdwc(KxlhcdwcParam param) {
 
-        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite())) {
+        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
             return R.parse("鍙傛暟涓嶈兘涓虹┖锛岃妫�鏌ュ叆鍙�");
         }
         WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1831,7 +1831,7 @@
             zphjcdwcVo.setWorkNo(wrkMast1.getWrkNo());
             zphjcdwcVo.setStaNo(wrkMast1.getStaNo());
             zphjcdwcVo.setSourceStaNo(site);
-            zphjcdwcVo.setBarcode(site == 3046 ? "T1046" : "T1042");
+            zphjcdwcVo.setBarcode(param.getBarcode());
             zphjcdwcVos.add(zphjcdwcVo);
         }
 

--
Gitblit v1.9.1