#

luxiaotao1123

2021-04-12 641de82a0458ab5ba66b5e735895caad26708fa8

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

@@ -12,14 +12,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
import zy.cloud.wms.manager.service.WrkStsService;
import zy.cloud.wms.manager.service.*;

import java.util.List;

@@ -40,6 +35,12 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CustOrderService custOrderService;

    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
    public R stockPakin(@RequestBody PakinParam number) {
        return workService.stockPakin(number, getUserId());
    }

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
@@ -125,10 +126,11 @@
    @ManagerAuth(memo = "生成销售订单编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
        String number = "PR-" + String.valueOf(nextId).substring(0, 15);
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
            return R.error("抱歉单号已存在，请再生成一次");
        }
        return R.ok().add(String.valueOf(nextId));
        return R.ok().add(number);
    }

    @RequestMapping("/order/init")
@@ -139,8 +141,54 @@

    @RequestMapping("/stock/transfer")
    @ManagerAuth(memo = "库存调拨")
    public R stockTransfer(@RequestParam String number) {
        return workService.stockTransfer(number, getUserId());
    public R stockTransfer(@RequestBody AsrsTransferParam number) {
        return R.error();
    }

    @RequestMapping("/stock/check")
    @ManagerAuth(memo = "库存盘点")
    public R stockCheck(@RequestBody StoCheckParam param) {
        return workService.stockCheck(param, getUserId());
    }

    @RequestMapping("/stock/check/auditing")
    @ManagerAuth(memo = "盘点记录审核")
    public R checkAuditing(@RequestParam Long checkId) {
        return workService.stockCheckAuditing(checkId, getUserId());
    }


    /******************************************************************************************************/

    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private CstmrService cstmrService;
    @Autowired
    private ItemService itemService;

    // 获取所有单据类型
    @RequestMapping("/docType/all/get")
    @ManagerAuth
    public R getDocTypeData() {
        List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).orderBy("create_time", false));
        return R.ok().add(docTypes);
    }

    // 获取所有客户
    @RequestMapping("/cstmr/all/get")
    @ManagerAuth
    public R getCstmrData() {
        List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
        return R.ok().add(cstmrs);
    }

    // 获取所有项目
    @RequestMapping("/item/all/get")
    @ManagerAuth
    public R getItemData() {
        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
        return R.ok().add(items);
    }

}