#

luxiaotao1123

2021-08-08 16df414db25bf21058077e37ad3bc28bba1cbb10

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

@@ -1,16 +1,22 @@
package zy.cloud.wms.manager.controller;

import com.alibaba.fastjson.JSON;
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 com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.ErpR;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
@@ -23,6 +29,7 @@
/**
 * Created by vincent on 2021/2/25
 */
@Slf4j
@RestController
@RequestMapping("/work")
public class WorkController extends BaseController {
@@ -37,11 +44,20 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ErpService erpService;


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

    @RequestMapping("/stock/pakout")
    @ManagerAuth(memo = "出库")
    public R stockPakout(@RequestBody PakoutParam number) {
        return workService.stockPakout(number, getUserId());
    }

    @RequestMapping("/stock/in")
@@ -83,7 +99,7 @@
    @RequestMapping("/pakout/get")
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1, 2));
        if (Cools.isEmpty(pakouts)) {
            return R.parse(BaseRes.EMPTY);
        }
@@ -95,8 +111,8 @@
        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("wrkSts$", wrkSts == null ? "未知" : wrkSts.getStsName())
                .add("custName", Cools.isEmpty(pakouts.get(0).getCustName()) ? "-" : pakouts.get(0).getCustName())
                .add("pakouts", pakouts)
        );
    }
@@ -115,7 +131,7 @@

    @RequestMapping("/hand/control/pakout")
    @ManagerAuth(memo = "手动处理拣货单")
    public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
    public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type) {
        if (type == 1) {
            return workService.completePakout(wrkNo, getUserId());
        } else if (type == 2) {
@@ -136,7 +152,7 @@
    }

    @RequestMapping("/order/init")
    @ManagerAuth(memo = "生成销售订单")
    @ManagerAuth(memo = "生成订单")
    public R initOrder(@RequestBody InitOrderParam param) {
        return workService.initOrder(param, getUserId());
    }
@@ -144,7 +160,13 @@
    @RequestMapping("/stock/transfer")
    @ManagerAuth(memo = "库存调拨")
    public R stockTransfer(@RequestBody AsrsTransferParam number) {
        return R.error();
        return workService.asrsStockTransfer(number, getUserId());
    }

    @RequestMapping("/stock/transfer/locMode")
    @ManagerAuth(memo = "库存调拨-立库模式")
    public R stockTransferLocMode(@RequestBody AsrsTransferParam number) {
        return workService.asrsStockTransferLocMode(number, getUserId());
    }

    @RequestMapping("/stock/check")
@@ -159,6 +181,55 @@
        return workService.stockCheckAuditing(checkId, getUserId());
    }

    @RequestMapping("/stock/checks/auditing")
    @ManagerAuth(memo = "盘点记录批量审核")
    public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
        int success = 0;
        for (Long checkId : checkIds) {
            R r = workService.stockCheckAuditing(checkId, getUserId());
            if (String.valueOf(r.get("code")).equals("200")) {
                success++;
            }
        }
        return R.ok("审核成功数量：" + success);
    }

    // 盘点上传
    @RequestMapping("/check/upload")
    @ManagerAuth(memo = "盘点上传")
    public R checkUpload(@RequestBody CheckUploadParam params) {
        List<BillDto> dtos = new ArrayList<>();
        if (params.getMats().size() > 0) {
            for (Mat matList : params.getMats()) {
                BillDto dto = new BillDto();
                dto.setMatnr(matList.getMatnr());
                dto.setQty(matList.getCount().doubleValue());
                dtos.add(dto);
            }
        } else {
            throw new CoolException("数据异常");
        }
        int docId;
        String docNum;
        if (params.getType().equals("1")) { // 盘盈
            docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
            docId = 14; // 报溢单
        } else if (params.getType().equals("2")) { // 盘亏
            docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
            docId = 9;  // 报损单
        } else {
            throw new CoolException("数据异常");
        }
        // erp上传盘盈盘亏
        ErpR erpR = erpService.uploadBill(dtos, docId, docNum);
        if (!erpR.getSuccess()) {
            throw new CoolException("无法上报至erp："+erpR.getMsg());
        }
        String dotsStr = JSON.toJSONString(dtos);
        log.info("盘点上传，类型：" + (docId == 14 ? "盘盈" : "盘亏") + "，单号：" + docNum + "，上传物料清单:" + dotsStr);
        log.info("===============================================================================================");
        return R.ok().add("上报至erp成功");
    }

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

@@ -207,6 +278,7 @@
        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