#

yxFwq

2024-11-28 d8c7f7a5715428f5c0034856ceaff0d091dad5d7

#

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -32,7 +32,7 @@
        private String batch;

        // 物料数量
        private Double anfme;
        private Double anfme = 1.0;

        // 商品名称
        private String maktx;

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -669,7 +669,9 @@
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
//                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setAnfme(1.0);  // 数量
                waitPakin.setWeight(mat.getWeight());  // 重量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
@@ -719,8 +721,10 @@
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
//                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setAnfme(1.0);  // 数量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setWeight(mat.getWeight());  // 重量
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1199,7 +1199,7 @@
            throw new CoolException("品号 matnr,请先下发基础档案！！！");
        }
        if (Cools.isEmpty(mat.getUnits())){
            throw new CoolException("品号 matnr,重量范围偏移值为空！！！,请先下发基础档案！！！");
            throw new CoolException("品号 matnr,重量范围偏移值为空！！！,请先维护基础档案！！！");
        }

        ArrayList<Integer> crns =new ArrayList<>();

 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java

@@ -177,7 +177,7 @@
            }
            crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[0],crnCount[1]})[0]+1);
            crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[2],crnCount[3],crnCount[4]})[0]+3);
            crnList.add(CodeDetectionUtil.crnCodeDetectionMaxT(new int[]{crnCount[2],crnCount[3],crnCount[4]},crnList.get(1))[0]+3);
            crnList.add(CodeDetectionUtil.crnCodeDetectionMaxT(new int[]{crnCount[2],crnCount[3],crnCount[4]},crnList.get(1)-3)[0]+3);
            crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[5],crnCount[6]})[0]+6);
            crnList.add(1);
            crnList.add(2);

 src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java

@@ -37,11 +37,14 @@
    /**
     * 检测数组最大值及其索引
     */
    public static int[] crnCodeDetectionMaxT(int[] arr,Integer crnNo) {
    public static int[] crnCodeDetectionMaxT(int[] arr,Integer crnNoIndex) {
        int max = arr[0];
        if (crnNoIndex == 0){
            max = arr[1];
        }
        int index = 0;
        for (int i = 0; i < arr.length; i++) {
            if (crnNo == i+1){
            if (crnNoIndex == i){
                continue;
            }
            if (arr[i] > max) {