From d9f9ec16b45ed0101e6afdb2beb4878524c339f3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 18:39:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 80 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8c15105..7c29e2a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,12 +5,17 @@
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.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.IpTools;
+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.List;
@@ -21,7 +26,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -30,6 +35,39 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ApiLogService apiLogService;
+
+
+
+ /****************************************************************************/
+ /********************************* 鎵撳寘涓婄嚎 **********************************/
+ /****************************************************************************/
+
+
+ @PostMapping("/order/pakin/new/package/v1")
+ public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+ @RequestParam(required = false) String barcode,
+ HttpServletRequest request) {
+ auth(appkey, barcode);
+ if (Cools.isEmpty(barcode)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.packageUp(barcode);
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎵撳寘涓婄嚎鎺ュ彛",
+ request.getRequestURI(),
+ appkey,
+ IpTools.gainRealIp(request),
+ barcode,
+ JSON.toJSONString(R.ok()),
+ Boolean.TRUE
+ );
+ return R.ok();
+ }
+
+
/**
* 娣诲姞鍏ュ簱鍗�
@@ -58,11 +96,45 @@
* 鍏ュ簱鍗曞洖鍐�
*/
@PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderCompleteParam param) {
+ public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param) {
auth(appkey, param);
return R.ok().add(openService.pakinOrderComplete(param));
}
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/new/default/v1")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param) {
+ auth(appkey, param);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱鍗曞洖鍐�
+ */
+ @PostMapping("/order/pakout/complete/default/v1")
+ public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param) {
+ auth(appkey, param);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
/**
* 搴撳瓨缁熻
@@ -101,10 +173,12 @@
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:
--
Gitblit v1.9.1