#

Junjie

4 天以前 710f7a55f6023f6d490b0ca66d4679bfc270480b

#

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -610,6 +610,7 @@
                        && this.boxType1.equals(orderDetl.getBoxType1())
                        && this.boxType2.equals(orderDetl.getBoxType2())
                        && this.boxType3.equals(orderDetl.getBoxType3())
                        && this.cstateid.equals(orderDetl.getCstateid())
        );
    }

@@ -624,6 +625,7 @@
                        && this.boxType1.equals(orderDetl.getBoxType1())
                        && this.boxType2.equals(orderDetl.getBoxType2())
                        && this.boxType3.equals(orderDetl.getBoxType3())
                        && this.cstateid.equals(orderDetl.getCstateid())
        );
    }


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

@@ -521,11 +521,6 @@
            IaIjBillB iaIjBillB = new IaIjBillB();
            String remark = orderDetl.getRemark();
            if (!Cools.isEmpty(remark)) {
                NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
                if (nccScPcdaWms == null) {
                    throw new CoolException("批次[{}]物料[{}]未找到" + orderDetl.getBatch() + "-" + orderDetl.getMatnr());
                }

                Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
                NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
                iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -533,7 +528,7 @@
                iaIjBillB.setNnum(orderDetl.getQty());
                iaIjBillB.setVbatchcode(orderDetl.getBatch());
                iaIjBillB.setClocationid("");
                iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
                iaIjBillB.setCstateid(orderDetl.getCstateid());

                hid = nccSaleDbddWms.getCbillid();
            }