From 087db8aee2e9cbfb44b8e61531c1cace5e36a6e2 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期日, 28 四月 2024 14:53:52 +0800 Subject: [PATCH] ERP接口同步 --- src/main/java/com/zy/asrs/controller/OpenController.java | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index c03764f..3ae0e59 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,15 +1,11 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPObject; import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; -import com.zy.asrs.entity.ManLocDetl; -import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.*; +import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; @@ -55,6 +51,7 @@ * 娣诲姞鍏ュ簱鍗� */ @PostMapping("/order/pakin/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, HttpServletRequest request) { @@ -75,6 +72,16 @@ return R.ok(); } + /* + * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛 + * */ + @PostMapping("/digital/twin/inventory/quantity") + public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey, + HttpServletRequest request) { + auth(appkey, null, request); + return R.ok(openService.inventoryQuantity()); + } + /** * 娣诲姞鍑哄簱鍗� @@ -88,13 +95,13 @@ if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } - if (Cools.isEmpty(param.getOrderNo())) { + if (Cools.isEmpty(param.getCCode())) { return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖"); } - if (Cools.isEmpty(param.getOrderType())) { + if (Cools.isEmpty(param.getType())) { return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖"); } - if (Cools.isEmpty(param.getOrderDetails())) { + if (Cools.isEmpty(param.getADDBody())) { return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖"); } openService.pakoutOrderCreate(param); @@ -108,9 +115,10 @@ */ @RequestMapping("/stock/default/v1") public R queryStock(@RequestHeader(required = false) String appkey, + @RequestBody StockVo stockVo, HttpServletRequest request) { - auth(appkey, null, request); - return R.ok().add(openService.queryStock()); + auth(appkey, stockVo, request); + return R.ok().add(openService.queryStock(stockVo)); } private void auth(String appkey, Object obj, HttpServletRequest request) { @@ -172,16 +180,6 @@ param1.setOrderNo("963001846497017856"); System.out.println(JSON.toJSONString(param1)); } - - - @RequestMapping("/manDetl/add") - public R manDetlAdd(@RequestBody JSONObject json){ - String locNo = (String)json.get("locNo"); - String orderNo = (String)json.get("orderNo"); - - return R.ok(); - } - } -- Gitblit v1.9.1