From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 03 七月 2025 13:21:56 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OpenController.java | 107 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 74 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 0fdc587..27a4246 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -3,13 +3,14 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.AppAuth; -import com.core.common.*; +import com.core.common.BaseRes; +import com.core.common.Cools; +import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.WrkMast; import com.zy.asrs.entity.param.*; import com.zy.asrs.service.OpenService; import com.zy.asrs.service.WrkMastService; -import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +20,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,30 +40,74 @@ @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<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, @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) { - wrkMast.setWrkSts(4L); - }else { - wrkMast.setWrkSts(14L); + if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) { + if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) { + wrkMast.setWrkSts(4L); + } + } else { + if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) { + if (wrkMast.getStaNo()==1031){ + wrkMast.setWrkSts(106L); + }else { + wrkMast.setWrkSts(14L); + } + } } - if (!wrkMastService.updateById(wrkMast)){ - return R.error(); + wrkMast.setModiTime(new Date()); + if (!wrkMastService.updateById(wrkMast)) { + return R.error("鏇存柊澶辫触"); } - }catch (Exception e) { + } catch (Exception e) { throw new CoolException(e); } @@ -70,9 +116,7 @@ } - @PostMapping("/locDetl/select/time/v1") - @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅") public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey, @RequestBody(required = false) TimeSelectParam param, HttpServletRequest request) { @@ -88,7 +132,7 @@ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛") public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, - HttpServletRequest request){ + HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -100,8 +144,8 @@ @PostMapping("/orderSync/default/v1") @AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛") public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) GTOrderParam param, - HttpServletRequest request){ + @RequestBody(required = false) GTOrderParam param, + HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -109,7 +153,6 @@ return R.ok(); } - /****************************************************************************/ @@ -147,7 +190,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); @@ -189,7 +232,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); @@ -218,21 +261,19 @@ return R.ok().add(openService.queryStock()); } - private void auth(String appkey, Object obj, HttpServletRequest request) { - log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj)); - request.setAttribute("cache", obj); - if (!auth) { - return; - } - if (Cools.isEmpty(appkey)) { - throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�"); - } - if (!APP_KEY_LIST.contains(appkey)) { - throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�"); - } + private void auth(String appkey, Object obj, HttpServletRequest request) { + log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj)); + request.setAttribute("cache", obj); + if (!auth) { + return; } - - + if (Cools.isEmpty(appkey)) { + throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�"); + } + if (!APP_KEY_LIST.contains(appkey)) { + throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�"); + } + } /** -- Gitblit v1.9.1