#

mrzhssss

2022-03-25 3f31d6aa87063f91fd3c2678d32638b3cb3000f6

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

@@ -17,7 +17,9 @@
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;

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

/**
@@ -37,6 +39,8 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private OrderService orderService;
    @Autowired
    private PickoutService pickoutService;

    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
@@ -78,6 +82,12 @@
    @ManagerAuth(memo = "拣货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(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")
@@ -143,13 +153,28 @@
    @ManagerAuth(memo = "生成单据编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
        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("/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) {