Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2025-02-21 0355ffdf65a1d3ac6202dbddd5b49f726b39bbad

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

@@ -39,6 +39,20 @@
    @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 = "物料分类同步")
@@ -75,7 +89,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);