From 0823adb64bcb21d38ba022888ea8f2a0dc1a8541 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期一, 31 三月 2025 14:31:45 +0800 Subject: [PATCH] wcs电视机代码移植 --- src/main/java/com/zy/asrs/controller/OpenController.java | 229 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 197 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 19883d4..24bd3a6 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,21 +1,25 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; -import com.zy.asrs.entity.param.OpenOrderCompleteParam; -import com.zy.asrs.entity.param.OpenOrderPakinParam; -import com.zy.asrs.entity.param.OpenOrderPakoutParam; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.entity.param.*; import com.zy.asrs.service.OpenService; +import com.zy.asrs.service.WorkService; +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; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; /** @@ -33,35 +37,49 @@ @Autowired private OpenService openService; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private WorkService workService; - + @PostMapping("/order/matSync/default/v1") + @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛") + public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey, + @RequestBody(required = false) MatSyncParam param, + HttpServletRequest request) { + auth(appkey, param, request); + if (Cools.isEmpty(param)) { + return R.parse(BaseRes.PARAM); + } + openService.syncMat(param); + return R.ok(); + } /****************************************************************************/ /********************************* 鎵撳寘涓婄嚎 **********************************/ /****************************************************************************/ - - @PostMapping("/order/pakin/new/package/v1") - @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛") - public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey, - @RequestParam(required = false) String barcode) { - auth(appkey, barcode); - if (Cools.isEmpty(barcode)) { - return R.parse(BaseRes.PARAM); - } - openService.packageUp(barcode); - return R.ok(); - } - - +// @PostMapping("/order/pakin/new/package/v1") +// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛") +// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey, +// @RequestBody(required = false) PackParam param, +// HttpServletRequest request) { +// auth(appkey, param, request); +// if (Cools.isEmpty(param)) { +// return R.parse(BaseRes.PARAM); +// } +// openService.packageUp(param); +// return R.ok(); +// } /** * 娣诲姞鍏ュ簱鍗� */ - @PostMapping("/order/pakin/new/default/v1") + @PostMapping("/order/pakin/default/v1") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param) { - auth(appkey, param); + @RequestBody OpenOrderPakinParam param, + HttpServletRequest request) { + auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } @@ -83,20 +101,29 @@ */ @PostMapping("/order/pakin/complete/default/v1") public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param) { - auth(appkey, param); + @RequestBody(required = false) OpenOrderCompleteParam param, + HttpServletRequest request) { + auth(appkey, param, request); return R.ok().add(openService.pakinOrderComplete(param)); } /** * 娣诲姞鍑哄簱鍗� */ - @PostMapping("/order/pakout/new/default/v1") + @PostMapping("/order/pakout/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱") public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakoutParam param) { - auth(appkey, param); + @RequestBody OpenOrderPakoutParam param, + HttpServletRequest request) { + auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); + } + if (Cools.isEmpty(param.getLgort())) { + return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖"); + } + if (!param.getLgort().equals("5006")) { + return R.ok(); } if (Cools.isEmpty(param.getOrderNo())) { return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖"); @@ -116,8 +143,9 @@ */ @PostMapping("/order/pakout/complete/default/v1") public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param) { - auth(appkey, param); + @RequestBody(required = false) OpenOrderCompleteParam param, + HttpServletRequest request) { + auth(appkey, param, request); return R.ok().add(openService.pakoutOrderComplete(param)); } @@ -126,14 +154,15 @@ * 搴撳瓨缁熻 */ @RequestMapping("/stock/default/v1") - public R queryStock(@RequestHeader(required = false) String appkey) { - auth(appkey, null); + public R queryStock(@RequestHeader(required = false) String appkey, + HttpServletRequest request) { + auth(appkey, null, request); return R.ok().add(openService.queryStock()); } - - private void auth(String appkey, Object obj) { + private void auth(String appkey, Object obj, HttpServletRequest request) { log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj)); + request.setAttribute("cache", obj); if (!auth) { return; } @@ -184,4 +213,140 @@ System.out.println(JSON.toJSONString(param1)); } + /*********************************鍚屾鐗╂枡妗f鍜岃鍗�****************************************************/ + + /*********************************wcs鎺ュ彛瀵规帴****************************************************/ + + /** + * 浠诲姟寮�濮� + */ + @RequestMapping("/start/task") + public HashMap<String, Object> startTask(@RequestBody HashMap<String, Object> map) { + String taskNo = map.get("TaskNo") + ""; + HashMap<String, Object> map1 = new HashMap<>(); + if (Cools.isEmpty(taskNo)) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�"); + } else { + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo))); + if (wrkMast == null) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo); + } else { + if (wrkMast.getIoType() == 1) { + wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮� + } else if (wrkMast.getIoType() == 11) { + wrkMast.setWrkSts(13L);//鍑哄簱寮�濮� + } + wrkMast.setModiTime(new Date()); + if (wrkMastService.updateById(wrkMast)) { + map1.put("ReturnStatus", "0"); + map1.put("ErrorMessage", ""); + } else { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast); + } + } + } + return map1; + } + + /** + * 鎼繍鍒扮洰鐨勫湴 + */ + @RequestMapping("/destination/task") + public HashMap<String, Object> destinationTask(@RequestBody HashMap<String, Object> map) { + String taskNo = map.get("TaskNo") + ""; + HashMap<String, Object> map1 = new HashMap<>(); + if (Cools.isEmpty(taskNo)) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�"); + } else { + //浠诲姟瀹屾垚 + if (map.get("Result").equals(1)) { + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo))); + if (wrkMast == null) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo); + } else { + if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) { + wrkMast.setWrkSts(4L);//浠诲姟缁撴潫 + } else if (wrkMast.getIoType() == 101) { + wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂 + } else if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) { + wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫 + } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) { + wrkMast.setWrkSts(14L); + } + wrkMast.setModiTime(new Date()); + if (wrkMastService.updateById(wrkMast)) { + map1.put("ReturnStatus", "0"); + map1.put("ErrorMessage", ""); + } else { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast); + } + } + } else { + //浠诲姟鍙栨秷 + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo))); + if (wrkMast == null) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo); + return map1; + } + workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L); + } + } + return map1; + } + + /** + * 鍑哄簱---鐩殑鍦版惉绂� + */ + @RequestMapping("/leave/task") + public HashMap<String, Object> leaveTask(@RequestBody HashMap<String, Object> map) { + String taskNo = map.get("TaskNo") + ""; + HashMap<String, Object> map1 = new HashMap<>(); + if (Cools.isEmpty(taskNo)) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�"); + } else { + + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo))); + if (wrkMast == null) { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo); + return map1; + } + if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) && wrkMast.getWrkSts() != 14) { + wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂 + wrkMast.setModiTime(new Date()); + if (wrkMastService.updateById(wrkMast)) { + map1.put("ReturnStatus", "0"); + map1.put("ErrorMessage", ""); + } else { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast); + } + } else if (wrkMast.getIoType() != 101) { + map1.put("ReturnStatus", "0"); + map1.put("ErrorMessage", ""); + return map1; + } else { + wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂 + wrkMast.setModiTime(new Date()); + if (wrkMastService.updateById(wrkMast)) { + map1.put("ReturnStatus", "0"); + map1.put("ErrorMessage", ""); + } else { + map1.put("ReturnStatus", "1"); + map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast); + } + } + + + } + return map1; + } } -- Gitblit v1.9.1