#

lsh

2024-01-21 113342593a17ecb75cd2f7f5af271a2528fd4a10

#

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

@@ -41,6 +41,10 @@
        //托盘码
        private String zpallet;

        private String origin;

        private Double weight;

        // 木箱中铜箔数量
        private Double anfme;


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

@@ -255,10 +255,12 @@
                orderDetl.setSpecs(locDetl.getSpecs());//规格
                orderDetl.setBrand(locDetl.getBrand());//木箱类型
                orderDetl.setBarcode(locDetl.getZpallet());//木箱类型
                orderDetl.setWeight(locDetl.getWeight());
//                orderDetl.setWorkQty(locDetl.getAnfme());
                orderDetl.setWorkQty(0.0);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setOrigin(locDetl.getOrigin());
                orderDetl.setCreateBy(userId);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(userId);

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

@@ -87,6 +87,8 @@
                }
                LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
                        locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
                locDto.setOrigin(locDetl.getOrigin());
                locDto.setWeight(locDetl.getWeight());
                locDtos.add(locDto);
            }

@@ -102,6 +104,8 @@
                locDetl.setModel(locDto.getModel());
                locDetl.setSpecs(locDto.getSpecs());
                locDetl.setZpallet(locDto.getZpallet());
                locDetl.setOrigin(locDto.getOrigin());
                locDetl.setWeight(locDto.getWeight());

                param.setOrderNo(locDto.getOrderNo());


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

@@ -31,8 +31,11 @@

    private String orderNo;

    private String origin;

    private Double anfme;
    private Double count;
    private Double weight;

    private boolean lack = false;


 src/main/java/com/zy/common/service/CommonService.java

@@ -179,6 +179,11 @@
            if (basCrnpService.checkSiteError(crnNo, true)) {
                rowCount =  locNecessaryParameters[0];
                nearRow = locNecessaryParameters[3];
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                if (locMasts.size()<=10){
                    times++;
                    continue;
                }
                break;
            } else {
                times++;
@@ -308,7 +313,7 @@
        }

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            rowLastno.setCurrentRow(curRow);
            rowLastnoService.updateById(rowLastno);
        }