优化MES调拨信息上报及库位查询逻辑

zhangc

2024-12-31 83b8b7cecfe8266a44bfce696d857b3be7149e3f

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

@@ -31,21 +31,29 @@
        private Double count;

        // 销售订单号
        private String orderNo;

        // 销售订单号
        private String threeCode;

        //销售订单行号
        private String deadTime;

        //料箱码
        //货架码
        private String suppCode;

        public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode) {
        // 工序
        private Integer processSts;

        public LocDetlAdjust(String matnr, String batch, Double count, String orderNo,String threeCode, String deadTime, String suppCode, Integer processSts) {
            this.matnr = matnr;
            this.batch = batch;
            this.count = count;
            this.orderNo = orderNo;
            this.threeCode = threeCode;
            this.deadTime = deadTime;
            this.suppCode = suppCode;
            this.processSts = processSts;
        }
    }

@@ -57,14 +65,14 @@
        for (LocDetlAdjust adjust : list) {
            boolean exit = false;
            for (LocDetlAdjust copy : copyList) {
                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch()) && Cools.eq(adjust.getSuppCode(),copy.getSuppCode()) && Cools.eq(adjust.getThreeCode(),copy.getThreeCode()) && Cools.eq(adjust.getDeadTime(),copy.getDeadTime())) {
                    copy.setCount(copy.getCount() + adjust.getCount());
                    exit = true;
                    break;
                }
            }
            if (!exit) {
                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode()));
                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(),adjust.getOrderNo(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode(),adjust.getProcessSts()));
            }
        }
        list = copyList;