#

LSH

2023-12-27 9b14697f5146ade2e81db8269824f79c9bc6ac62

#

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

@@ -36,17 +36,17 @@
        private Double anfme;

        private String owner;
        private String origin;
        private int beBatch;

        public DetlDto2(){}
        public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner,String origin){
        public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner,int beBatch){
            this.matnr=matnr;
            this.maktx=maktx;
            this.batch=batch;
            this.specs=specs;
            this.anfme=anfme;
            this.owner=owner;
            this.origin=origin;
            this.beBatch=beBatch;
        }
    }


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

@@ -132,6 +132,7 @@
        List<DetlDto> orderDetails = param.getOrderDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
            dto.setBeBatch(detail.getBeBatch());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
@@ -172,6 +173,7 @@
            orderDetl.setPayment(detlDto.getPayment());
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setBeBatch(detlDto.getBeBatch());
            orderDetl.setWeight(detlDto.getWeight());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
@@ -237,6 +239,7 @@
        List<DetlDto> orderDetails = param.getOrderDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
            dto.setBeBatch(detail.getBeBatch());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
@@ -263,6 +266,7 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setBeBatch(detlDto.getBeBatch());
            orderDetl.setWeight(detlDto.getWeight());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");

 src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java

@@ -76,9 +76,9 @@
            List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
            for (OrderDetl orderDetl:orderDetls){
                if (Cools.isEmpty(entryIds)){
                    entryIds = orderDetl.getOrigin();
                    entryIds = orderDetl.getBeBatch().toString();
                }else {
                    entryIds = entryIds+"," +orderDetl.getOrigin();
                    entryIds = entryIds+"," +orderDetl.getBeBatch();
                }
            }
            orderNoS = "";

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

@@ -23,7 +23,7 @@

    private int owner;
    private String ownerName;
    private String orgin;
    private int beBatch;

    private int payment;

@@ -37,7 +37,7 @@
        this.batch=detlDto2.getBatch();
        this.anfme=detlDto2.getAnfme();
        this.ownerName=detlDto2.getOwner();
        this.orgin=detlDto2.getOrigin();
        this.beBatch=detlDto2.getBeBatch();
        this.payment=0;
    }