#1

lsh

19 小时以前 75e92e196c01e33de751544ad037dc631c5edf61

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

@@ -742,7 +742,15 @@
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);

        StartupDto dto = commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
        StartupDto dto = null;
        try{
            dto = commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
        } catch (Exception e){
            throw new CoolException(e.getMessage());
        }
        if (dto == null) {
            throw new CoolException("未找到库位");
        }

        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -1356,7 +1364,7 @@
    public List<Map<String, Object>> boxTypeComb() {
        EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
        List<Map<String, Object>> result = new ArrayList<>();
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true));
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",1));
        for (BasBoxType basBoxType : basBoxTypes){
            Map<String, Object> map = new HashMap<>();
            map.put("boxType", basBoxType.getBoxType());
@@ -1371,7 +1379,7 @@
    public List<Map<String, Object>> boxTypeComb2() {
        EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
        List<Map<String, Object>> result = new ArrayList<>();
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true));
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",999));
        for (BasBoxType basBoxType : basBoxTypes){
            Map<String, Object> map = new HashMap<>();
            map.put("boxType", basBoxType.getBoxType());