13

zhang

刚刚 ab41622d30946f83b34e5a5d881741237628f6f1

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

@@ -40,20 +40,33 @@
    @Autowired
    private WrkMastService wrkMastService;

    @GetMapping("/order/delete/v1")
    @GetMapping("/pakout/order/delete/v1")
    @AppAuth(memo = "订单信息删除")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                      @RequestParam String orderNo,
                                      HttpServletRequest request) {
    public synchronized R orderPakinDelete(@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);
        openService.orderPakinDelete(orderNo);
        return R.ok();

    }

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

    }

    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
@@ -96,9 +109,9 @@
                }
            } else {
                if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
                    if (wrkMast.getStaNo()==1031){
                    if (wrkMast.getStaNo() == 1031) {
                        wrkMast.setWrkSts(106L);
                    }else {
                    } else {
                        wrkMast.setWrkSts(14L);
                    }
                }
@@ -190,7 +203,7 @@
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param.getDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakinOrderCreate(param);
@@ -232,7 +245,7 @@
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param.getDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);