From 1883a6d5d7041a9bfbb39c32bdd81c7b9990a6fd Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期五, 18 四月 2025 13:27:22 +0800 Subject: [PATCH] qw --- src/main/webapp/static/js/mat/mat.js | 3 ++- src/main/webapp/views/mat/mat.html | 2 +- src/main/java/com/zy/common/web/WcsController.java | 8 -------- src/main/java/com/zy/common/service/CommonService.java | 1 + src/main/resources/application.yml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 70b6b64..9cc149f 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -362,6 +362,7 @@ } // 鏇存柊搴撲綅鎺掑彿 if (Cools.isEmpty(locMast)){ + rowLastno.setCurrentRow(curRow); rowLastnoService.updateById(rowLastno); } } diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 2eab1e8..2f0d138 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -530,15 +530,7 @@ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList()); boolean mixtrue =false; - if (matnrs.size() == 1 && batchs.size() == 1) { - }else if(matnrs.size() > 1 && batchs.size() == 1) { - mixtrue = true; - }else if(matnrs.size() == 1 && batchs.size() > 1) { - mixtrue = true; - }else if(matnrs.size() > 1 && batchs.size() > 1) { - mixtrue = true; - } StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto, mixtrue); if (Cools.isEmpty(dto)){ throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 293ff8a..d77f0bf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -108,7 +108,7 @@ url: "10.0.100.140:8088/wcs" loc-move: - enable: true + enable: false crn1: true crn2: false crn3: false diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js index ac98ca5..ebef356 100644 --- a/src/main/webapp/static/js/mat/mat.js +++ b/src/main/webapp/static/js/mat/mat.js @@ -333,7 +333,8 @@ for (let i=0;i<res.data.length;i++){ var templateDom = $("#templatePreview"+templateNo); var className = templateDom.attr("class"); - var param = "缂栫爜:"+res.data[i].matnr+";鍚嶇О:"+res.data[i].maktx+";瑙勬牸:"+res.data[i].specs; + var param = res.data[i].matnr; + //var param = "缂栫爜:"+res.data[i].matnr+";鍚嶇О:"+res.data[i].maktx+";瑙勬牸:"+res.data[i].specs; var encodeUrl = encodeURIComponent(param); if (className === 'template-barcode') { res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+encodeUrl; diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html index 86ced73..932a3fb 100644 --- a/src/main/webapp/views/mat/mat.html +++ b/src/main/webapp/views/mat/mat.html @@ -157,7 +157,7 @@ <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></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/mat/mat.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/mat/mat.js?v=1" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script> <!-- 琛ㄥ崟寮圭獥 --> -- Gitblit v1.9.1