qw

zc

2025-04-18 1883a6d5d7041a9bfbb39c32bdd81c7b9990a6fd

qw

 src/main/java/com/zy/common/service/CommonService.java

@@ -362,6 +362,7 @@
            }
            // 更新库位排号
            if (Cools.isEmpty(locMast)){
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);
            }
        }

 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("未找到库位信息");

 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

 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&param="+encodeUrl;

 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>

<!-- 表单弹窗 -->