逻辑调整

ZY

2024-09-21 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00

逻辑调整

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -103,6 +103,7 @@
                        locDto.setPacking(locDetl.getPacking());
                        locDto.setProType(locDetl.getProType());
                        locDto.setSPgNO(locDetl.getSPgNO());
                        locDto.setColor(locDetl.getColor());
                        locDtos.add(locDto);
                        //exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
@@ -121,6 +122,7 @@
                locDto.setPacking(orderDetl.getPacking());
                locDto.setProType(orderDetl.getProType());
                locDto.setSPgNO(orderDetl.getSPgNO());
                locDto.setColor(orderDetl.getColor());
                locDtos.add(locDto);
            }
        }

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

@@ -41,6 +41,8 @@

        private String proType;


        private String color;
    }

}

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

@@ -15,7 +15,7 @@

    private static final Logger log = LoggerFactory.getLogger(MatCompareUtils.class);

    private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"};
    private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};


    public static boolean compare(Object object1, Object object2) {

 src/main/java/com/zy/common/model/LocDto.java

@@ -35,7 +35,7 @@

    private String zpallet;

    //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"
    //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType" color
    private String outOrderNo;

    private String luHao;
@@ -44,6 +44,7 @@

    private String proType;

    private String color;

    public LocDto() {
    }

 src/main/java/com/zy/common/web/WcsController.java

@@ -367,6 +367,7 @@
                Order order = orderService.selectByNo(waitPakin.getOrderNo());
                if (order != null) {
                    OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
                    wrkDetl.setBatch(orderDetl.getBatch());
                    wrkDetl.setProType(orderDetl.getProType());
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());