#

whycq

2025-01-02 5317c6f53f6997e42e5bb9b72da4d8bbd6df9715

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

@@ -1,13 +1,17 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
@@ -33,11 +37,19 @@
    private WorkService workService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private StaDescService staDescService;

    @RequestMapping("/available/put/site")
    @ManagerAuth()
    public R availablePutSite(){
        return R.ok().add(basDevpService.getAvailableInSite());
    }

    @RequestMapping("/available/put/site5")
    @ManagerAuth()
    public R availablePutSite5(){
        return R.ok().add(basDevpService.getAvailableInSite5());
    }

    @RequestMapping("/available/empty/put/site")
@@ -53,15 +65,18 @@
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            StaDesc stnNo = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", siteId).eq("type_no",101));

            map.put("siteId", siteId);
            map.put("desc", siteId + "（全板出库口）");
            map.put("desc", siteId + "（"+stnNo.getStnDesc()+"）");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            StaDesc stnNo = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", siteId).eq("type_no",103));
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（拣料出库口）");
            map.put("desc", siteId + "（"+stnNo.getStnDesc()+"）");
            result.add(map);
        }
        return R.ok().add(result);
@@ -80,9 +95,12 @@
    }

    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
//    @ManagerAuth(memo = "全板入库")
    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
        return R.ok("入库启动成功").add(workService.startupFullPutStore(fullStoreParam,getUserId()));

            return R.ok("入库启动成功").add(workService.startupFullPutStore(fullStoreParam,9527L));

//        return R.ok("入库启动成功").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
    }

    @RequestMapping("/plate/out/start")
@@ -99,6 +117,13 @@
        return R.ok("客户转换成功");
    }

    @RequestMapping("/turn/over/out/payment/start")
    @ManagerAuth(memo = "货物形态转换")
    public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
        workService.turnOverOutPayment(param, getUserId());
        return R.ok("货物形态已转为"+param.getPayment$(param.getPayment()));
    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {