From 0cc757ad57bcb2fcdd650dd87b2a3195ed30a57e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 14 十月 2024 10:12:15 +0800
Subject: [PATCH] 显示优化
---
src/main/webapp/static/js/locDetl/locDetl.js | 25 +++++++++++++------------
src/main/java/com/zy/asrs/entity/LocDetl.java | 14 ++++++++++++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 77e069a..c049038 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -188,6 +188,20 @@
}
}
+ public String getDeadWarn$(){
+ if (null == this.deadWarn){ return "鏈悊璐�"; }
+ switch (this.deadWarn){
+ case 0:
+ return "鏈悊璐�";
+ case 1:
+ return "鐞嗚揣涓�";
+ case 2:
+ return "宸茬悊璐�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
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 e0b1efd..11dc289 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1329,7 +1329,7 @@
// 杩斿洖GWCS鐩爣淇℃伅
pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo(),param.getBarcode(),"gwms鐢宠鍏ュ簱鍚庢帹閫乬wcs");
- return R.ok();
+ return null;
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index ec618ba..810b43d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -206,7 +206,7 @@
}
// 淇敼鎹℃枡鍏ュ簱鐨勫簱瀛樻槑缁嗙殑鐞嗚揣鐘舵�佷负寰呯悊璐�
- locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),1);
+ locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),0);
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 622e2d0..c94a1c5 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,31 +1,32 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true,width: 120}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true,hide: true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵规', width: 250, sort:true,hide: true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'color', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false,width: 250}
- ,{field: 'brand', align: 'center',title: '鍖呰缁勫彿', hide: false}
+ ,{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true,width: 120}
+ ,{field: 'brand', align: 'center',title: '鍖呰缁勫彿', hide: false,width: 150}
+ ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false,width: 150}
+ ,{field: 'unit', align: 'center',title: '绠卞彿', hide: false,width: 150}
+ ,{field: 'color', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
+ ,{field: 'manu', align: 'center',title: '绠¤姱绫诲瀷', hide: false}
+ ,{field: 'sku', align: 'center',title: '瀹炴祴瀹藉箙', hide: false}
+ ,{field: 'itemNum', align: 'center',title: '鐢熺當鍘氬害', hide: false}
+ ,{field: 'manuDate', align: 'center',title: '鍒嗗垏涓嬫枡鏃堕棿', hide: false,width: 180}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
- ,{field: 'unit', align: 'center',title: '绠卞彿', hide: false}
,{field: 'price', align: 'center',title: '浠锋牸', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '闀垮害', hide: false}
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'specs', align: 'center',title: '鎺ュご'}
+ ,{field: 'deadWarn$', 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}
--
Gitblit v1.9.1