From 09211d189468e0901180c4dde8340d5487657ccb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 31 七月 2025 10:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
license.lic | 0
src/main/webapp/static/js/locDetl/locDetl.js | 1 +
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/java/com/zy/asrs/entity/param/BoxInParam.java | 1 +
src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js | 4 ++--
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 6 +++---
src/main/webapp/static/js/saas/locDetl.js | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++++++++-
src/main/webapp/static/js/common.js | 4 ++--
src/main/resources/license.lic | 0
src/main/resources/application.yml | 3 ++-
11 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/license.lic b/license.lic
new file mode 100644
index 0000000..7c74f9e
--- /dev/null
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/entity/param/BoxInParam.java b/src/main/java/com/zy/asrs/entity/param/BoxInParam.java
index edc3b99..d5058c3 100644
--- a/src/main/java/com/zy/asrs/entity/param/BoxInParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/BoxInParam.java
@@ -10,4 +10,5 @@
private String batch; //灏哄
private String memo; // 澶囨敞
private Double anfme;
+ private String old;
}
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 4afc3a7..0bf1a91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1564,6 +1564,16 @@
throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛�" + param.getBarcode());
}
+ if (Cools.isEmpty(param.getAnfme())) {
+ throw new CoolException("璇疯緭鍏ユ暟閲�" + param.getAnfme());
+ }
+ if (Cools.isEmpty(param.getMemo())) {
+ throw new CoolException("璇疯緭鍏ュ娉�");
+ }
+ if (Cools.isEmpty(param.getOld())) {
+ throw new CoolException("璇疯緭鍏ユ柊鏃�" );
+ }
+
int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
if (zpalletCount > 0) {
throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + param.getBarcode());
@@ -1611,6 +1621,7 @@
if (!Cools.isEmpty(param.getBatch())) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setMatnr("绌虹");
+ wrkDetl.setSuppCode(param.getOld());
wrkDetl.setAnfme(param.getAnfme());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -2207,7 +2218,7 @@
@Override
public List<Map<String, Object>> pdaGetMemo() {
- List<Integer> tagIds = Arrays.asList(7, 8);
+ List<Integer> tagIds = Arrays.asList(7, 8,9);
List<Map<String, Object>> raw = matMapper.getBoxMemoMap(tagIds);
// 鐢� Map<String, List<String>> 鍒嗙粍
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f3ca2c6..1ca4440 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
+ #url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 7c74f9e..72952e9 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index bba248f..5440615 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -207,7 +207,7 @@
,{field: 'specs', align: 'center',title: '鎺ュご',hide: false}
,{field: 'threeCode', align: 'center',title: '鍚堟牸鍚�', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
@@ -249,7 +249,7 @@
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '鍚堟牸鍚�', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true, sort:true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index e1eb111..ca0fd87 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -28,6 +28,7 @@
,{field: 'length', align: 'center',title: '闀垮害', hide: false}
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'specs', align: 'center',title: '鎺ュご', hide:true}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'deadWarn$', align: 'center',title: '鐞嗚揣鐘舵��', hide: false}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 7744711..fd45b06 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -27,12 +27,12 @@
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'supp', align: 'center',title: '鏂版棫'}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'source', align: 'center',title: '鏂版棫'}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 4358fc9..66245fe 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -29,11 +29,11 @@
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'source', align: 'center',title: '鏂版棫'}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
diff --git a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
index 2103c50..9a368ec 100644
--- a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
+++ b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
@@ -50,11 +50,11 @@
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
+ ,{field: 'suppCode', align: 'center',title: '鏂版棫'}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
- ,{field: 'source$', align: 'center',title: '鍒惰喘'}
+ ,{field: 'source', align: 'center',title: '鏂版棫'}
,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 3a54719..5b1b000 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -116,7 +116,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=11" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=12" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1