qw

zc

2025-04-19 4a09820519af817c7423abee62da3bd70a7f1afd

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/4/8
@@ -38,17 +39,37 @@
    @Autowired
    private WrkMastService wrkMastService;

    @GetMapping("/order/delete/v1")
    @AppAuth(memo = "订单信息删除")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                  @RequestParam String orderNo,
                                  HttpServletRequest request) {
        auth(appkey, orderNo, request);
        if (Cools.isEmpty(orderNo)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.orderDelete(orderNo);
        return R.ok();

    }


    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) List<TagParam> param,
                                        @RequestBody(required = false) List<Map<String,String>> param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.syncTag(param);
        ArrayList<TagParam> params = new ArrayList<>();
        for (Map<String,String> map : param) {
            TagParam tagParam  = new TagParam(map);
            params.add(tagParam);
        }

        openService.syncTag(params);
        return R.ok();

    }
@@ -59,22 +80,22 @@
    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) ShuttleFinishParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        //auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        try {
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no",7));
            if (Cools.isEmpty(wrkMast)) {
                throw new CoolException("四向库任务未找到");
            }
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10|| wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
                wrkMast.setWrkSts(4L);
            }else {
                wrkMast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(wrkMast)){
                return R.error();
                return R.error("更新失败");
            }
        }catch (Exception e) {
            throw new CoolException(e);
@@ -87,7 +108,6 @@


    @PostMapping("/locDetl/select/time/v1")
    @AppAuth(memo = "时间获取库存信息")
    public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) TimeSelectParam param,
                                        HttpServletRequest request) {