#

luxiaotao1123

2021-03-03 01f56e1480178f0ee3ce7d2a67a85b5dad94d204

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,10 +12,13 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
import zy.cloud.wms.manager.service.WrkStsService;

import java.util.List;

@@ -28,6 +33,8 @@
    private WorkService workService;
    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private WrkStsService wrkStsService;

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
@@ -42,9 +49,15 @@
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    @ManagerAuth(memo = "捡货")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "捡货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/allot")
@@ -57,7 +70,27 @@
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
        return R.ok().add(pakouts);
        if (Cools.isEmpty(pakouts)) {
            return R.parse(BaseRes.EMPTY);
        }
        Long sts = pakouts.get(0).getWrkSts();
        if (sts == 1) {
            sts =2L;
        }
        WrkSts wrkSts = wrkStsService.selectById(sts);
        return R.ok().add(Cools
                .add("number", pakouts.get(0).getDocNum())
                .add("wrkSts", pakouts.get(0).getWrkSts())
                .add("wrkSts$", wrkSts==null?"未知":wrkSts.getStsName())
                .add("custName", Cools.isEmpty(pakouts.get(0).getCustName())?"-":pakouts.get(0).getCustName())
                .add("pakouts", pakouts)
        );
    }

    @RequestMapping("/stock/out/confirm")
    @ManagerAuth(memo = "捡货确认")
    public R stockOutConfirm(@RequestBody StockConfirmParam param) {
        return workService.stockOutComplete(param, getUserId());
    }

}