From d647ee9a9564a769f053d93bd7cf6e95dd8f5b3c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 19 九月 2024 16:18:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..f8829d5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -33,7 +33,22 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v1")
+
+
+ @PostMapping("/locDetl/select/time/v1")
+ @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅")
+ public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) TimeSelectParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<LocDetlByTimeDTO> locDetlByTimeDTOS = openService.selectTimeLocDetl(param);
+ return R.ok(locDetlByTimeDTOS);
+ }
+
+ @PostMapping("/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
@@ -45,6 +60,21 @@
openService.syncMat(param);
return R.ok();
}
+
+ @PostMapping("/orderSync/default/v1")
+ @AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) GTOrderParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return R.ok();
+ }
+
+
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
@@ -151,57 +181,32 @@
return R.ok().add(openService.queryStock());
}
- 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;
+ 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;
+ }
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
}
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
+
+
+
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/agv/haikang/complete/v1")
+ public R agvHaiKang(@RequestHeader(required = false) String wrkNo,
+ HttpServletRequest request) {
+// auth(wrkNo, null, request);
+ return R.ok().add(openService.agvHaiKang(wrkNo));
}
- public static void main(String[] args) {
- // 1
- System.out.println("======================================");
- OpenOrderPakinParam param = new OpenOrderPakinParam();
- param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
- param.setOrderType("鎵撳寘涓婄嚎鍗�");
- param.setOrderTime(DateUtils.convert(new Date()));
- List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
- for (int i = 0; i < 3; i++) {
- DetlDto detlDto = new DetlDto();
- switch (i) {
- case 0:
- detlDto.setMatnr("MDH020030530");
- detlDto.setBatch("500");
- detlDto.setAnfme(18.0);
- break;
- case 1:
- detlDto.setMatnr("MDH020016416");
- detlDto.setBatch("500");
- detlDto.setAnfme(32.0);
- break;
- case 2:
- detlDto.setMatnr("LSH90152025");
- detlDto.setAnfme(50.0);
- break;
- default:
- break;
- }
- orderDetails.add(detlDto);
- }
- System.out.println(JSON.toJSONString(param));
- // 2
- System.out.println("======================================");
- OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
- param1.setOrderNo("963001846497017856");
- System.out.println(JSON.toJSONString(param1));
- }
}
--
Gitblit v1.9.1