1.減料途中幷板完善 2.訂單出庫作業優化

cp

2025-07-08 2712cf6566bc3304bda8b32d84875096fa0a64d0

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java

@@ -223,23 +223,28 @@
            if (Cools.isEmpty(mat)){
                return R.error("品号:"+locInPrintMat.getMatnr()+"不存在，请先新增商品档案！！！").add("品号:"+locInPrintMat.getMatnr()+"不存在，请先新增商品档案！！！");
            }
            // 打印数据注入
            MatPrint print = new MatPrint();
            print.setMatnr(mat.getMatnr());
            print.setBarcode(mat.getBarcode());
            print.setMaktx(mat.getMaktx());
            print.setSpecs(mat.getSpecs());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());
            int count=1;
            if(!Cools.isEmpty(locInPrintMat.getAnfme())){
                count=locInPrintMat.getAnfme().intValue();
            }
            for(int i=1;i<=count;i++){
                // 打印数据注入
                MatPrint print = new MatPrint();
                print.setMatnr(mat.getMatnr());
                print.setBarcode(mat.getBarcode());
                print.setMaktx(mat.getMaktx());
                print.setSpecs(mat.getSpecs());
                print.setUnit(mat.getUnit());
                print.setMemo(mat.getMemo());

            print.setMaterial(mat.getMaterial());
            print.setDecrees(locInPrintMat.getDecrees());
            print.setImgNum(mat.getImgNum());
            print.setWeight(String.valueOf(mat.getWeight()));
            print.setModel(mat.getModel());
            print.setLength(String.valueOf(mat.getLength()));
            print.setWidth(mat.getWidth());
            print.setHeight(mat.getHeight());
                print.setMaterial(mat.getMaterial());
                print.setDecrees(locInPrintMat.getDecrees());
                print.setImgNum(mat.getImgNum());
                print.setWeight(String.valueOf(mat.getWeight()));
                print.setModel(mat.getModel());
                print.setLength(String.valueOf(mat.getLength()));
                print.setWidth(mat.getWidth());
                print.setHeight(mat.getHeight());
//            // 打印数据注入
//            MatPrint print = new MatPrint();
//            print.setMatnr(locInPrintMat.getMatnr());
@@ -249,8 +254,10 @@
//            print.setLocNo(locInPrintMat.getLocNo());
//            print.setOwnerId(locInPrintMat.getOwnerId());
//            print.setOwner(locInPrintMat.getOwner$());
            print.setId(locInPrintMat.getId());
            res.add(print);
                print.setId(locInPrintMat.getId());
                res.add(print);
            }

            locInPrintMat.setUpdateTime(new Date());
            locInPrintMat.setUpdateBy(getUserId());
            locInPrintMat.setStatus(2);