#

gt-fuwuqi

2024-11-05 bbdf70526760e6c4378486b89764493b52e9afd2

#

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

@@ -94,7 +94,6 @@


    @PostMapping("/locDetl/select/time/v1")
    @AppAuth(memo = "时间获取库存信息")
    public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) TimeSelectParam param,
                                        HttpServletRequest request) {

 src/main/java/com/zy/common/utils/TreeUtils.java

@@ -59,7 +59,7 @@
            Map<String, Object> map = new HashMap<>();
            map.put("title", tag.getName());
            map.put("id", tag.getId());
            map.put("spread", true);
            map.put("spread", false);
            List<Map> childrens = new ArrayList<>();
            map.put("children", childrens);
            dealTag(tag, childrens);

 src/main/java/com/zy/common/web/WcsController.java

@@ -55,14 +55,14 @@
    private StaDescService staDescService;



    @Transactional
    public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
        log.info("收到WCS拣料入库接口请求====>>入参:{}", param);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("未找到任务");
        }
        StartupDto dto = null;
        StartupDto dto = new StartupDto();
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
@@ -95,7 +95,7 @@
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setModiTime(now);
                if (wrkMastService.updateById(wrkMast)) {
                if (!wrkMastService.updateById(wrkMast)) {
                    throw new CoolException("更新工作档数据状态失败");
                }
                // 更新明细档io_time (历史档关联使用）
@@ -279,7 +279,7 @@
        }
        WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", 103)
                .in("io_type", 103,53)
                .eq("wrk_sts",14));
        if (!Cools.isEmpty(wrkMastPakin)){
            StartupDto locNo3 = getLocNo3(param);

 src/main/java/com/zy/system/controller/UserController.java

@@ -117,6 +117,9 @@
        if (user.getMobile()!=null) {
            entity.setMobile(user.getMobile());
        }
        if (user.getRoleId()!=null) {
            entity.setRoleId(user.getRoleId());
        }
        userService.updateById(entity);
        return R.ok();
    }