#
Junjie
2023-12-26 b0f679bdaa1b5483d7abb4e8524a5fd8f43ab525
#
5个文件已修改
49 ■■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java
@@ -14,4 +14,6 @@
    List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
    List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
}
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
@@ -13,4 +13,10 @@
     */
    List<Integer> getAvailableInSite();
    /**
     * 出库站
     * @return
     */
    List<Integer> getAvailableOutSite(Integer typeNo);
}
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
@@ -16,4 +16,9 @@
        return this.baseMapper.getAvailableInSite(1);
    }
    @Override
    public List<Integer> getAvailableOutSite(Integer typeNo) {
        return this.baseMapper.getAvailableOutSite(typeNo);
    }
}
zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
@@ -13,4 +13,15 @@
        group by abd.dev_no
    </select>
    <select id="getAvailableOutSite" resultType="java.lang.Integer">
        select
            abd.dev_no
        from asr_bas_devp abd
                 left join asr_sta_desc asd on abd.dev_no = asd.stn_no
        where 1=1
          and asd.type_no = #{typeNo}
        -- and abd.out_enable = 'Y'
        group by abd.dev_no
    </select>
</mapper>
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -10,6 +10,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 工作流接口控制器
 * Created by vincent on 2020/6/10
@@ -30,5 +35,25 @@
        return R.ok().add(basDevpService.getAvailableInSite());
    }
    @RequestMapping("/available/take/site")
    @ManagerAuth()
    public R availableTakeSite(){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "(全板出库口)");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "(拣料出库口)");
            result.add(map);
        }
        return R.ok().add(result);
    }
}