From eed51ce47f20afb0661acc42baa680fcb6351a39 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 26 一月 2026 13:16:14 +0800
Subject: [PATCH] 6.8	查询所有库位状态和物料-二机床信息化数字孪生用

---
 src/main/java/com/zy/common/web/WcsController.java |    7 +++++--
 1 files changed, 5 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 9e43cf2..62755a9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -63,6 +63,9 @@
         if (Cools.isEmpty(param.getSourceStaNo())) {
             return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
         }
+        if (Cools.isEmpty(param.getBarcode())) {
+            return R.error("鏉$爜涓嶈兘涓虹┖");
+        }
         List<WaitPakin> waitPakins = null;
         if (param.getIoType() == 1) {
             if (Cools.isEmpty(param.getBarcode())) {
@@ -82,13 +85,13 @@
                 return R.error(CodeRes.EXIST_500);
             }
         }
-        if (Cools.isEmpty(param.getLocType1(),param.getLocType2())){
+        if (Cools.isEmpty(param.getLocType2())){ //  param.getLocType1(),
             return R.error("楂樹綆/闀跨煭妫�娴嬩俊鍙蜂笉鑳戒负绌�");
         }
 
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
-        sourceStaNo.setLocType1(param.getLocType1());
+        sourceStaNo.setLocType1((short) 1); // todo 鍏堥粯璁や綆搴撲綅
         sourceStaNo.setLocType2(param.getLocType2());
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
 

--
Gitblit v1.9.1