From 7eefd146ab0997a5d26bdd66dff63b515b8f58c7 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期六, 11 三月 2023 08:39:29 +0800 Subject: [PATCH] erp --- src/main/java/com/zy/asrs/controller/OpenController.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 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..5ad85ce 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,20 +1,17 @@ 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.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; @@ -108,6 +105,8 @@ */ @RequestMapping("/stock/default/v1") public R queryStock(@RequestHeader(required = false) String appkey, + @RequestParam("matnr") String matnr, + @RequestParam("batch") String batch, HttpServletRequest request) { auth(appkey, null, request); return R.ok().add(openService.queryStock()); @@ -174,12 +173,21 @@ } - @RequestMapping("/manDetl/add") + @RequestMapping("/manDetl/in") public R manDetlAdd(@RequestBody JSONObject json){ - String locNo = (String)json.get("locNo"); - String orderNo = (String)json.get("orderNo"); + if (json == null){ + return R.error("浼犲叆鏁版嵁涓虹┖"); + } + return openService.manDetlIn(json); + } - return R.ok(); + + @RequestMapping("/manDetl/out") + public R manDetlDelete(@RequestBody JSONObject json){ + if (json == null){ + return R.error("浼犲叆鏁版嵁涓虹┖"); + } + return openService.manDetlOut(json); } -- Gitblit v1.9.1