From e0004817f2edb903fd9707b194ba8db2429e33ae Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 04 三月 2024 13:46:57 +0800 Subject: [PATCH] 入出库日志筛选 入库无需校验 --- src/main/java/com/zy/asrs/controller/OpenController.java | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 5ad85ce..3b86a9c 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,17 +1,16 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; 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; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -52,6 +51,7 @@ * 娣诲姞鍏ュ簱鍗� */ @PostMapping("/order/pakin/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, HttpServletRequest request) { @@ -70,6 +70,16 @@ } openService.pakinOrderCreate(param); 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()); } @@ -105,11 +115,10 @@ */ @RequestMapping("/stock/default/v1") public R queryStock(@RequestHeader(required = false) String appkey, - @RequestParam("matnr") String matnr, - @RequestParam("batch") String batch, + @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) { @@ -171,25 +180,5 @@ param1.setOrderNo("963001846497017856"); System.out.println(JSON.toJSONString(param1)); } - - - @RequestMapping("/manDetl/in") - public R manDetlAdd(@RequestBody JSONObject json){ - if (json == null){ - return R.error("浼犲叆鏁版嵁涓虹┖"); - } - return openService.manDetlIn(json); - } - - - @RequestMapping("/manDetl/out") - public R manDetlDelete(@RequestBody JSONObject json){ - if (json == null){ - return R.error("浼犲叆鏁版嵁涓虹┖"); - } - return openService.manDetlOut(json); - } - - } -- Gitblit v1.9.1