#

luxiaotao1123

2021-04-13 47015b98442acc527509235d5b9c22857751aeef

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

@@ -12,15 +12,12 @@
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.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;

import java.util.ArrayList;
import java.util.List;

/**
@@ -41,6 +38,12 @@
    @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 = "上架")
    public R stockIn(@RequestBody StockInParam stockInParam) {
@@ -59,8 +62,8 @@
        return workService.stockOutPreview(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    @RequestMapping("/stock/out/create")
    @ManagerAuth(memo = "生成拣货单")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
    }
@@ -140,8 +143,8 @@

    @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")
@@ -156,4 +159,67 @@
        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("/cstmr/all/get/kv")
    @ManagerAuth
    public R getCstmrDataKV() {
        List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Cstmr cstmr : cstmrs) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(cstmr.getName());
            vo.setValue(cstmr.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

    // 获取所有项目
    @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);
    }
    // 获取所有项目
    @RequestMapping("/item/all/get/kv")
    @ManagerAuth
    public R getItemDataKV() {
        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Item item : items) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(item.getName());
            vo.setValue(item.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

}