Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

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

@@ -16,8 +16,11 @@
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.AddZero;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -37,7 +40,11 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private OrderService orderService;
    @Autowired
    private PickoutService pickoutService;

    @Autowired
    private ReceiveService receiveService;
    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
    public R stockPakin(@RequestBody PakinParam number) {
@@ -77,9 +84,13 @@
    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "拣货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId(), getHostId());
    }


        return workService.stockInPrint(stockOutParam, getUserId(), getHostId());
    @RequestMapping("/pick/out/print")
    @ManagerAuth(memo = "PickOut打印拣货单")
    public R pickOutPrint(@RequestBody Pickout pickout){
        return pickoutService.stockOutPrint(pickout,getUserId(), getHostId());
    }

    @RequestMapping("/stock/allot")
@@ -144,19 +155,47 @@
    @RequestMapping("/orderNo/init")
    @ManagerAuth(memo = "生成单据编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
        if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
            return R.error("抱歉，单据编号已存在");
        String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
        String currNum = receiveService.getCurrNum(billNo);
        String orderNo=null;
        if (!Cools.isEmpty(currNum)) {
            String[] split = currNum.split("-");
            if (split.length < 2){
                orderNo= billNo + "0001";
            }
            Integer newNum = Integer.parseInt(split[2]) +1;
            String format = AddZero.addZeroForNum(newNum + "", 4);
            orderNo = billNo + format;
        }else {
            orderNo = billNo + "0001";
        }
        return R.ok().add(orderNo);
    }

//    @RequestMapping("/orderNo/init1")
//    @ManagerAuth(memo = "生成单据编号")
//    public R initOrderNo1() {
//        long nextId = snowflakeIdWorker.nextId();
//        SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
//        String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
//        //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
//        if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
//            return R.error("抱歉，单据编号已存在");
//        }
//        return R.ok().add(orderNo);
//    }

    @RequestMapping("/receive/init")
    @ManagerAuth(memo = "生成销售订单")
    public R initReceive(@RequestBody InitOrderParam param) {
        return workService.initReceive(param, getUserId(), getHostId());
    }
    @RequestMapping("/order/init")
    @ManagerAuth(memo = "生成销售订单")
    public R initOrder(@RequestBody InitOrderParam param) {
        return workService.initOrder(param, getUserId(), getHostId());
    }


    @RequestMapping("/stock/transfer")
    @ManagerAuth(memo = "库存调拨")
@@ -206,6 +245,13 @@
                eq("host_id", getHostId()).orderBy("create_time", false).eq("doc_class",docClass));
        return R.ok().add(docTypes);
    }
    @RequestMapping("docType/out/get")
    @ManagerAuth
    public R getDocOutTypeData(Integer docClass){
        List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).
                eq("host_id", getHostId()).orderBy("create_time", false).eq("doc_class",docClass));
        return R.ok().add(docTypes);
    }

    // 获取所有客户
    @RequestMapping("/cstmr/all/get")