Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

zhang

1 天以前 b1cbb59d39cea44d35110d95e54fbd86d4a12e13

Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

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

@@ -13,7 +13,8 @@
    private Integer palletizingNo;// 码垛位编号

    private List<MatList> matList; // 木箱集合

    //1一厂平库 2 一厂立库 3二厂平库 4二厂立库
    private Integer warehouseType ;
    @Data
    public static class MatList{
        private String boxPos; // 箱子位置

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

@@ -1514,6 +1514,7 @@

    private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
        gwmsGenerateInventoryDto.setWarehouseType(4);
        gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
        gwmsGenerateInventoryDto.setPalletizingNo(wrkMast.getStaNo());
        List<GwmsGenerateInventoryDto.MatList> matLists = new ArrayList<>();