#

lsh

2024-10-11 64b5946fd1a0cba0fbae54f7334167cb7adfdc97

#

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

@@ -156,6 +156,7 @@
            locDetl.setModel(locDto.getModel());
            locDetl.setSpecs(locDto.getSpecs());
            locDetl.setZpallet(locDto.getZpallet());
            locDetl.setMemo(locDto.getMemo());

            param.setOrderNo(locDto.getOrderNo());


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

@@ -13,6 +13,7 @@
    // 出站口
    private Integer outSite;
    private String orderNo;
    private String cstmrName;

    // 物料编号集合
    private List<LocDetl> locDetls;
@@ -29,6 +30,8 @@
        //木箱编码
        private String batch;

        private String memo;

        //批次
        private String model;


 src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java

@@ -15,6 +15,10 @@
    private String batch;
    @ExcelProperty(value = "订单号")
    private String orderNo;
    @ExcelProperty(value = "客户")
    private String cstmrName;
    @ExcelProperty(value = "备注")
    private String memo="";

    public OutLocBoxVo() {
    }
@@ -27,5 +31,11 @@
        this.batch = batch;
        this.orderNo = orderNo;
    }
    public OutLocBoxVo(String batch,String orderNo,String cstmrName,String memo) {
        this.batch = batch;
        this.orderNo = orderNo;
        this.cstmrName = cstmrName;
        this.memo = memo;
    }

}

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

@@ -167,6 +167,7 @@
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                one.setMemo(paramLocDetl.getMemo());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            }
        }
@@ -206,7 +207,7 @@
                    null,    // 初始票据号
                    null,    // 票据号
                    null,    // 客户编号
                    null,    // 客户
                    param.getCstmrName(),    // 客户
                    null,    // 联系方式
                    null,    // 操作人员
                    null,    // 合计金额
@@ -267,6 +268,7 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setMemo(locDetl.getMemo());
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("生成单据明细失败，请联系管理员");
                }

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

@@ -30,6 +30,7 @@

    private int total = 0;
    private String orderOneNo = null;
    private String cstmrName = null;
    private Long userId;
    List<String[]> OutLocBoxCs = new ArrayList<>();

@@ -61,6 +62,8 @@
    public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
        String batch = excel.getBatch();
        String orderNo = excel.getOrderNo();
//        String cstmrName = excel.getCstmrName();
        String memo = excel.getMemo();
        if (Cools.isEmpty(orderOneNo)){
            if (!Cools.isEmpty(excel.getOrderNo())){
                orderOneNo = excel.getOrderNo();
@@ -68,9 +71,18 @@
                throw new CoolException("订单号参数为空");
            }
        }
        String[] s=new String[2];
        if (Cools.isEmpty(cstmrName)){
            if (!Cools.isEmpty(excel.getCstmrName())){
                cstmrName = excel.getCstmrName();
            } else {
                throw new CoolException("客户名称参数为空");
            }
        }
        String[] s=new String[4];
        s[0] = batch;
        s[1] = orderOneNo;
        s[2] = cstmrName;
        s[3] = memo;
        OutLocBoxCs.add(s);
        total++;
    }
@@ -106,9 +118,11 @@
                            .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
                    for (LocDetl locDetl:locDetls){
                        total++;
                        String[] locDetlNow=new String[2];
                        String[] locDetlNow=new String[4];
                        locDetlNow[0] = locDetl.getBatch();
                        locDetlNow[1] = outLocBoxC[1];
                        locDetlNow[2] = outLocBoxC[2];
                        locDetlNow[3] = outLocBoxC[3];
                        outLocBoxCList.add(locDetlNow);
                        outLocBoxCNew.add(outLocBoxC[0]);
                    }
@@ -124,6 +138,7 @@
//                        locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
//                locDto.setOrigin(locDetl.getOrigin());
//                locDto.setWeight(locDetl.getWeight());
                locDetl.setMemo(outLocBoxC[3]);
                LocDto locDto = new LocDto(locDetl);
                locDtos.add(locDto);
            }
@@ -150,11 +165,13 @@
                locDetl.setZpallet(locDto.getZpallet());
                locDetl.setOrigin(locDto.getOrigin());
                locDetl.setWeight(locDto.getWeight());
                locDetl.setMemo(locDto.getMemo());

                locDetls.add(locDetl);
            }
            param.setLocDetls(locDetls);
            param.setOrderNo(orderOneNo);
            param.setCstmrName(cstmrName);

            if (total>0){
                workService.startupFullTakeStoreOrder(param,9999L);

 src/main/java/com/zy/common/entity/OutLocBoxExcel.java

@@ -19,5 +19,7 @@

    private String batch;
    private String orderNo;
    private String cstmrName;//客户
    private String memo;

}

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

@@ -31,6 +31,7 @@
    private String zpallet;

    private String orderNo;
    private String memo;

    private String origin;

@@ -109,6 +110,7 @@
        this.volume = locDetl.getVolume();
        this.price = locDetl.getPrice();
        this.origin = locDetl.getOrigin();
        this.memo = locDetl.getMemo();
    }

    public String getTitle() {