#

lsh

2024-10-11 73bf266cf0611862a76885c7cd81f7a3303e4cfa

#

 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -19,4 +19,8 @@

    List<WrkDetl> selectByWrkNo(Integer wrkNo);

    Integer count1();
    Integer count2(@Param("orderNo")String orderNo);
    Integer count3();

}

 src/main/java/com/zy/asrs/service/WrkDetlService.java

@@ -17,4 +17,8 @@

    List<WrkDetl> selectByWrkNo(Integer wrkNo);

    Integer count1();
    Integer count2(String orderNo);
    Integer count3();

}

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

@@ -2365,7 +2365,8 @@
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
            // 命令集合
            List<LedCommand> commands = new ArrayList<>();
            // 工作档集合
            String orderNo = null;
                    // 工作档集合
            List<WrkMast> wrkMasts = new ArrayList<>();
            for (Integer staNo : led.getStaArr()) {
                // 获取叉车站点
@@ -2425,7 +2426,13 @@
//                ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl)));
                    if (Cools.isEmpty(wrkDetls)){
                        continue;
                    }
                    Integer count1 = wrkDetlService.count1();
                    Integer count2 = wrkDetlService.count2(wrkDetls.get(0).getOrderNo());
                    Integer count3 = wrkDetlService.count3();
                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl,count1,count2,count3)));
                }
                commands.add(ledCommand);
            }

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

@@ -63,4 +63,16 @@
        return this.baseMapper.selectByWrkNo(wrkNo);
    }

    @Override
    public Integer count1() {
        return this.baseMapper.count1();
    }
    @Override
    public Integer count2(String orderNo) {
        return this.baseMapper.count2(orderNo);
    }
    @Override
    public Integer count3() {
        return this.baseMapper.count3();
    }
}

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

@@ -30,6 +30,12 @@
//    private String juanNo;
    private String price;
    private String orderNo;
    private String cstmrName;
    private String memo;
    private Integer count1;
    private Integer count2;
    private Integer count3;
    private Integer count4;

    // 物料数量
    private Double count;
@@ -68,4 +74,26 @@
        this.volume = wrkDetl.getVolume();
        this.orderNo = wrkDetl.getOrderNo();
    }

    public MatDto(WrkDetl wrkDetl,Integer count1,Integer count2,Integer count3) {
        this.matNo = wrkDetl.getMatnr();
        this.matnr = wrkDetl.getMatnr();
        this.maknx = wrkDetl.getMaktx();
        this.specs = wrkDetl.getSpecs();
        this.batch = wrkDetl.getBatch();
        this.model = wrkDetl.getModel();
        if (Cools.isEmpty(wrkDetl.getPrice())){
            wrkDetl.setPrice(0.0);
        }
        this.price = wrkDetl.getPrice().toString();
//        this.juanNo = wrkDetl.getSku();
        this.count = wrkDetl.getAnfme();
        this.weight = wrkDetl.getWeight();
        this.volume = wrkDetl.getVolume();
        this.orderNo = wrkDetl.getOrderNo();
        this.cstmrName = wrkDetl.getColor();
        this.count1 = count1;
        this.count2 = count2;
        this.count3 = count3;
    }
}

 src/main/java/com/zy/core/thread/LedThread.java

@@ -213,6 +213,14 @@
                for (MatDto matDto : command.getMatDtos()) {
                    sb.append("物料编码：").append(matDto.getMatNo()).append("\n");
                    sb.append("数量：").append(matDto.getCount()).append("\n");
                    sb.append("箱号：").append(matDto.getBatch()).append("\n");
                    sb.append("卷号：").append(matDto.getSpecs()).append("\n");
                    sb.append("订单号：").append(matDto.getOrderNo()).append("\n");
                    sb.append("客户：").append(matDto.getCstmrName()).append("\n");
                    sb.append("备注：").append(matDto.getMemo()).append("\n");
                    sb.append("总作业中数量：").append(matDto.getCount1()).append("\n");
                    sb.append("码垛后未取货数量：").append(matDto.getCount3()).append("\n");
                    sb.append("订单作业中数量：").append(matDto.getCount2()).append("\n");
                }
            }
            sb.append("\n");

 src/main/resources/application.yml

@@ -45,7 +45,7 @@
  enable: false

wms:
  url: 192.168.18.9:8080/jtwms
  url: 192.168.18.4:8080/jtwms

# 下位机配置
wcs-slave:

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -41,4 +41,16 @@
        select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
    </select>

    <select id="count1" resultType="Integer">
        select count(1) from asr_wrk_detl where 1=1 and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
    </select>

    <select id="count2" resultType="Integer">
        select count(1) from asr_wrk_detl where 1=1 and order_no = #{orderNo} and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
    </select>

    <select id="count3" resultType="Integer">
        select count(1) from asr_bas_devp where 1=1 and dev_no > 19999
    </select>

</mapper>