From 8e36d6e7a2837df41b35ca46bd3678cc1a8d0533 Mon Sep 17 00:00:00 2001 From: Administrator <876263681@qq.com> Date: 星期一, 30 十二月 2024 08:06:15 +0800 Subject: [PATCH] #导出优化,低库位满时,低库位的货往高库位寻找 --- src/main/webapp/views/locDetlStatis/locDetlStatis.html | 6 ++++++ src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +- src/main/java/com/zy/common/web/WcsController.java | 2 +- src/main/java/com/zy/common/service/CommonService.java | 15 +++++++++------ 4 files changed, 17 insertions(+), 8 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 b31d7b3..3d64d92 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -97,7 +97,7 @@ wrkMast.setIoTime(now); wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱 - wrkMast.setIoPri(14D); // 浼樺厛绾э細13 + wrkMast.setIoPri(13D); // 浼樺厛绾э細13 wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); wrkMast.setStaNo(dto.getStaNo()); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 32af254..d63a9fc 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -215,7 +215,7 @@ // 鏇存柊搴撲綅鎺掑彿 rowLastno.setCurrentRow(curRow); - rowLastnoService.updateById(rowLastno); + rowLastnoService.updateById(rowLastno); // 寮�濮嬫煡鎵惧簱浣� ==============================>> @@ -283,6 +283,9 @@ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 if (times < rowCount) { times = times + 1; + if(locTypeDto.getLocType1() == 1 && times == 3){ + locTypeDto.setLocType1((short) 2); + } return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times); } @@ -482,11 +485,11 @@ return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times); } - // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠� - //if (locTypeDto.getLocType1() == 1) { - // locTypeDto.setLocType1((short) 2); - // return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times); - //} +//// 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠� +// if (locTypeDto.getLocType1() == 1) { +// locTypeDto.setLocType1((short) 2); +// return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times); +// } log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); throw new CoolException("娌℃湁绌哄簱浣�"); } diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 0f6010c..3015925 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -187,7 +187,7 @@ wrkMast.setIoTime(new Date()); wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱 - wrkMast.setIoPri(14D); // 浼樺厛绾� + wrkMast.setIoPri(13D); // 浼樺厛绾� wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); wrkMast.setStaNo(dto.getStaNo()); diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html index 9b95556..7740f23 100644 --- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html +++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html @@ -9,6 +9,11 @@ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/css/common.css" media="all"> + <style> + #btn-export { + margin-top: 10px; + } + </style> </head> <body> @@ -59,6 +64,7 @@ <div class="layui-btn-container layui-col-md1"> <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button> </div> <div class="layui-btn-container"> <button class="layui-btn" lay-event="exportData" >瀵煎嚭閮ㄥ垎</button> -- Gitblit v1.9.1