From 6b87b1634b7a99b54ffcc98775839604cd06e6bf Mon Sep 17 00:00:00 2001 From: tzsk <Administrator@qq.com> Date: 星期日, 28 四月 2024 11:56:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 2 +- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +++++ src/main/webapp/views/agvLocDetl/locDetl.html | 2 +- src/main/webapp/static/js/agvLocMast/locMast.js | 2 +- src/main/webapp/static/js/agvStoMan/stoQue.js | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java index 400261b..db66bf1 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java @@ -248,7 +248,7 @@ log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏"); } if(agvLocDetls.size()>1){ - log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�"); + //log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�"); } } } 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 92ad0ce..0e8dc19 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -535,6 +535,11 @@ Mat mat = matService.selectByMatnr(locDto.getMatnr()); assert mat != null; + if (locDto.getStock() < locDto.getAnfme()) { + //鎬诲簱瀛樺皬浜庝綔涓氭暟閲忥紝寮傚父鏁版嵁 + throw new CoolException("搴撳瓨涓嶈冻锛岃绋嶅悗閲嶈瘯"); + } + if (!BaseController.isJSON(locDto.getOrderNo())) { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(mat); diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js index 0de37a1..fc711b0 100644 --- a/src/main/webapp/static/js/agvLocMast/locMast.js +++ b/src/main/webapp/static/js/agvLocMast/locMast.js @@ -28,7 +28,7 @@ // ,{field: 'locSts', align: 'center',title: ''} // ,{field: 'sheetNo', align: 'center',title: ''} //,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} - ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true} + ,{field: 'barcode', align: 'center',title: '浜岀淮鐮佸��', sort:true} ,{field: 'row1', align: 'center',title: '鎺�', sort:true} ,{field: 'bay1', align: 'center',title: '鍒�', sort:true} ,{field: 'lev1', align: 'center',title: '灞�', sort:true} diff --git a/src/main/webapp/static/js/agvStoMan/stoQue.js b/src/main/webapp/static/js/agvStoMan/stoQue.js index 4b0d3c1..ea9f1e1 100644 --- a/src/main/webapp/static/js/agvStoMan/stoQue.js +++ b/src/main/webapp/static/js/agvStoMan/stoQue.js @@ -30,7 +30,7 @@ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'} // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'} //,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} - ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true} + ,{field: 'barcode', align: 'center',title: '浜岀淮鐮佸��', sort:true} ,{field: 'row1', align: 'center',title: '鎺�'} ,{field: 'bay1', align: 'center',title: '鍒�'} ,{field: 'lev1', align: 'center',title: '灞�'} diff --git a/src/main/webapp/views/agvLocDetl/locDetl.html b/src/main/webapp/views/agvLocDetl/locDetl.html index 2d4401d..6f6f73f 100644 --- a/src/main/webapp/views/agvLocDetl/locDetl.html +++ b/src/main/webapp/views/agvLocDetl/locDetl.html @@ -59,7 +59,7 @@ <div class="layui-btn-container"> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button> </div> - <button style="display:none" id="compareToEss" > + <button style="" id="compareToEss" > <i class="layui-icon layui-icon-upload"></i> 搴撳瓨姣斿 </button> <input style="display:none" id="importExcel" type="file" onchange="upload(this)" > -- Gitblit v1.9.1