From c5b716ab10fb4c0136eb177eec10d7799c98076b Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 30 九月 2023 09:50:27 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/pakStore/emptyOut.js | 2 +- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 +-- src/main/webapp/static/js/wrkMast/wrkMast.js | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 8e78cae..7bc7e6a 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -598,8 +598,7 @@ // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) - .eq("stn_no", param.getOutSite()) - .eq("crn_no", outCrnNo); + .eq("stn_no", param.getOutSite()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("闈炴硶璺緞锛�"); diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js index 8bbc97c..a67782d 100644 --- a/src/main/webapp/static/js/pakStore/emptyOut.js +++ b/src/main/webapp/static/js/pakStore/emptyOut.js @@ -51,7 +51,7 @@ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true} ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200} // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'} - ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} + // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} ,{field: 'row1', align: 'center',title: '鎺�'} ,{field: 'bay1', align: 'center',title: '鍒�'} ,{field: 'lev1', align: 'center',title: '灞�'} diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index 546eb7e..e196bca 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -25,12 +25,13 @@ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'} ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'} ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'} - ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'} + // ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'} ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'} ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'} ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} ,{field: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70} + ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'} ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: false} ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true} ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true} -- Gitblit v1.9.1