From 7a3227174bde55918aef6f411489d0dd24c3b129 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 14:09:46 +0800
Subject: [PATCH] 工作历史档可搜索返修品

---
 src/main/webapp/views/wrkMastLog/wrkMastLog.html              |    9 +++++++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    3 ++-
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java   |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 7959a57..fc60578 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1468,6 +1468,7 @@
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
         wrkMast.setWrkNo(workNo);
+        wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
         wrkMast.setIoTime(new Date());
         wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
         wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
@@ -1551,7 +1552,7 @@
         pushFxrkToMes(param);
 
         // 杩斿洖GWCS鐩爣淇℃伅
-        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "浜屾ゼ杩斾慨鍏ュ簱鎺ㄩ�乬wcs");
+        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤艰繑淇叆搴撴帹閫乬wcs");
 
         return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
     }
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 f79844f..9114323 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1244,6 +1244,7 @@
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
         wrkMast.setWrkNo(workNo);
+        wrkMast.setWhsType(iotype == 1 && param.getPalletizingNo() == 2051 ? 1 : 0); // 杩斾慨鍏ュ簱鏍囪
         wrkMast.setIoTime(new Date());
         wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
         wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index fdaa517..65b70ef 100644
--- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -51,6 +51,15 @@
             </div>
         </div>
     </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <select name="whs_type" class="layui-input" type="text" autocomplete="off">
+                <option value="">杩斾慨鍝�</option>
+                <option value="0">鍚�</option>
+                <option value="1">鏄�</option>
+            </select>
+        </div>
+    </div>
     <!-- 鏃ユ湡鑼冨洿 -->
     <div class="layui-inline" style="width: 300px">
         <div class="layui-input-inline">

--
Gitblit v1.9.1