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

zjj

2024-11-05 af11b74ea0ec26ed8765244b3f51fad5aca9142a

 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
@@ -39,6 +40,27 @@
    private WrkMastService wrkMastService;


    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) List<Map<String,String>> param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.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();

    }


    @PostMapping("/wrkMast/finish/v1")
    @AppAuth(memo = "四向车任务完成")
    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,