From 159da6be4a8765efda4be50393ace7578a055429 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 30 一月 2023 11:52:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/waitPakinLog/waitPakinLog.html          |    5 +++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 ++++++++++------
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js        |    2 +-
 src/main/resources/application.yml                            |    4 ++--
 4 files changed, 18 insertions(+), 9 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 b9b9617..595dc84 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -77,9 +77,13 @@
             throw new CoolException(BaseRes.PARAM);
         }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+//            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+//        }
         if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+                eq("zpallet", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "缁勬墭鏁版嵁宸插瓨鍦�");
         }
 
         // todo: 涓嶄笅绾块噸鏂板叆搴�
@@ -101,10 +105,10 @@
             param.getCombMats().forEach(elem -> {
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
 
-                if (Cools.isEmpty(detlDto.getBatch())){
-                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
-                    detlDto.setBatch(batch);
-                }
+//                if (Cools.isEmpty(detlDto.getBatch())){
+//                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+//                    detlDto.setBatch(batch);
+//                }
 
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7799f69..28bad09 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
 #    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..018767f 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -16,7 +16,7 @@
                 return html;
             }}
         ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
-        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
     return cols;
 }
 layui.use(['table','laydate', 'form'], function(){
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 72b13f8..d9ab69c 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -19,6 +19,11 @@
             <input class="layui-input" type="text" name="pakin_id" placeholder="鍏ュ簱閫氱煡鍙�" autocomplete="off">
         </div>
     </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鍙�" autocomplete="off">
+        </div>
+    </div>
     <!-- 鏃ユ湡鑼冨洿 -->
     <div class="layui-inline" style="width: 300px">
         <div class="layui-input-inline">

--
Gitblit v1.9.1