no message

skyouc

4 天以前 4b079b635d7d968496c7c13ab97a32fd815ebf43

no message

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

@@ -88,7 +88,7 @@

        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();        
        Set<String> exist = new HashSet<>();

        // 获取订单主表
        OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());
@@ -117,6 +117,7 @@
                        List<String> collect = basStations.stream().map(BasStation::getDevNo).collect(Collectors.toList());
                        locDto.setAgvStaNos(collect);
                        locDto.setBrand(orderDetl.getBrand());
                        locDto.setSuppCode(orderDetl.getSuppCode());

                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
@@ -194,7 +195,7 @@
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDtos.add(locDto);
                        

                        locDetlUsage.put(detlId, used + currentIssue);
                        // 剩余待出数量递减
                        issued = issued - currentIssue;
@@ -361,8 +362,8 @@
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) { continue; }
            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
            if (TaskDto.has(taskDtos, taskDto)) {
                TaskDto dto = TaskDto.find(taskDtos, taskDto);
            if (TaskDto.hasAgv(taskDtos, taskDto)) {
                TaskDto dto = TaskDto.findAgv(taskDtos, taskDto);
                assert dto != null;
                dto.getLocDtos().addAll(taskDto.getLocDtos());
            } else {
@@ -370,14 +371,24 @@
            }
        }
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {
//            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                    .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
                    .eq("dev_no", taskDto.getAgvStaNo()));
            if (Objects.isNull(station)) { throw new CoolException("数据错误，站点不存在或已使用！！"); }
            workService.agvStockOut(station, taskDto, getUserId());
        }
        Map<String, List<TaskDto>> listMap = taskDtos.stream().collect(Collectors.groupingBy(TaskDto::getLocNo));
        listMap.keySet().forEach(locNo -> {
            listMap.get(locNo).forEach(taskDto -> {
                BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                        .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
                        .eq("dev_no", taskDto.getAgvStaNo()));
                if (Objects.isNull(station)) { throw new CoolException("数据错误，站点不存在或已使用！！"); }
                workService.agvStockOut(station, taskDto, getUserId());
            });
        });
//        for (TaskDto taskDto : taskDtos) {
////            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
//            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
//                    .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
//                    .eq("dev_no", taskDto.getAgvStaNo()));
//            if (Objects.isNull(station)) { throw new CoolException("数据错误，站点不存在或已使用！！"); }
//            workService.agvStockOut(station, taskDto, getUserId());
//        }
        return R.ok();
    }


 src/main/java/com/zy/asrs/entity/LocCache.java

@@ -35,6 +35,7 @@
     */
    @ApiModelProperty(value= "库位号")
    @TableField("loc_no")
//    @TableField(exist = false)  // 更新时忽略该字段
    private String locNo;

    /**

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -339,6 +339,12 @@
    @TableField("store_max_date")
    private Integer storeMaxDate;

    /**
     * 出库优先级
     */
    @TableField("group_proty")
    private Integer groupProty;

    public Mat() {}

    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {