From bab6283f5c0b5da44b7a342f9daef35473a13ab7 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 16 四月 2026 14:54:57 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 600 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 469 insertions(+), 131 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 88cc293..908b7a6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,155 +1,493 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.R;
+import com.core.annotations.AppAuth;
+import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.OpenApiStockOutParam;
-import com.zy.asrs.entity.result.PakoutVo;
-import com.zy.asrs.entity.result.StoPreTab;
-import com.zy.asrs.service.*;
-import com.zy.common.model.LocDetlDto;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.vo.OpenInventoryVo;
+import com.zy.asrs.entity.vo.TokenVo;
+import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.service.wms.Result;
+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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
- * Created by vincent on 2021/3/19
+ * Created by vincent on 2022/4/8
*/
+@Slf4j
@RestController
-@RequestMapping("/open/api")
-public class OpenController {
+@RequestMapping("open/asrs")
+public class OpenController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
@Autowired
- private LocDetlService locDetlService;
- @Autowired
- private MatCodeService matCodeService;
- @Autowired
- private WorkService workService;
- @Autowired
- private BasDevpService basDevpService;
+ private OpenService openService;
@Autowired
private WrkMastService wrkMastService;
+ @Value("${open-asrs.auth.app-id:wms_8f7c3d126a944e3ab5c89d21f4a7c6b2}")
+ private String openAppId;
- @PostMapping("/stockOut/prew")
- @Transactional
- public R stockOutPrew(@RequestBody List<OpenApiStockOutParam> params){
- List<StoPreTab> result = new ArrayList<>();
- StringBuilder errorMsg = new StringBuilder();
- boolean error = false;
- for (OpenApiStockOutParam param : params) {
- Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
- if (sumAnfme < param.getAnfme()) {
- if (!error) {
- error = true;
- }
- MatCode mat = matCodeService.selectById(param.getMatnr());
- errorMsg.append(mat == null ? param.getMatnr() : mat.getMatName()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(param.getAnfme() - sumAnfme).append("</br>");
- continue;
- }
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
- double anfme = issued;
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 瑙嗗浘瀵硅薄
- StoPreTab tab = new StoPreTab();
- tab.setTitle(locDetl.getMatnr() + "锛�" + locDetl.getMaktx() + "锛�");
- tab.setMatnr(locDetl.getMatnr());
- tab.setMaktx(locDetl.getMaktx());
- tab.setAnfme(param.getTotal());
+ @Value("${open-asrs.auth.app-secret:D9f3A7xP1kLm8Q2tW5zH0sY6vR4bNcE7FjK3uM9pT2aL8qX6}")
+ private String openAppSecret;
- tab.setLocNo(locDetl.getLocNo());
-// tab.setNodeId(locDetl.getNodeId());
- tab.setTotal(locDetl.getAnfme());
- tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- tab.setRemQty(tab.getTotal() - tab.getReduce());
- tab.setPrior(false);
- tab.setPrior$("脳");
- tab.setType(2);
- result.add(tab);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
+ @Value("${open-asrs.auth.token-valid-minutes:30}")
+ private Integer tokenValidMinutes;
+ private static final Map<String, TokenVo> TOKEN_CACHE = new ConcurrentHashMap<>();
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
+ @GetMapping("/order/delete/v1")
+ @AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
+ public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
+ auth(appkey, orderNo, request);
+ if (Cools.isEmpty(orderNo)) {
+ return R.parse(BaseRes.PARAM);
}
- if (error) {
- return R.error(errorMsg.toString());
- }
- return R.ok().add(result);
- }
+ openService.orderDelete(orderNo);
+ return R.ok();
- @PostMapping("/stockOut")
- @Transactional
- public R stockOut(@RequestBody List<OpenApiStockOutParam> params){
- List<PakoutVo> result = new ArrayList<>();
- if (!Cools.isEmpty(params)) {
- for (OpenApiStockOutParam param : params) {
- // 鎺ㄨ崘璐т綅琛ヤ粨宸ヤ綔妗ｉ槻閲�
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("packed", param.getAllotNo()).le("wrk_sts", 14)) > 0) {
- throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝ｅ湪鎵ц锛岃鑰愬績绛夊緟");
- }
- Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
- if (sumAnfme < param.getAnfme()) {
- throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
-
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
- double anfme = issued;
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
-
- // 鍏ㄦ澘
- if (issued>=locDetl.getAnfme()) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo());
- // 鎷ｆ枡
- } else {
- BasDevp staNo = basDevpService.checkSiteStatus(107);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo());
- }
-
- PakoutVo pakoutVo = new PakoutVo();
- pakoutVo.setLocNo(locDetl.getLocNo());
- pakoutVo.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- pakoutVo.setMatnr(locDetl.getMatnr());
- pakoutVo.setZpallet(locDetl.getZpallet());
- result.add(pakoutVo);
-
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
-
- }
- }
-
- return R.ok().add(result);
}
+ @PostMapping("/tagSync/v1")
+ @AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
+ public synchronized R tagSync(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) List<Map<String,String>> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ ArrayList<TagParam> params = new ArrayList<>();
+ for (Map<String,String> map : param) {
+ TagParam tagParam = new TagParam(map);
+ params.add(tagParam);
+ }
+
+ openService.syncTag(params);
+ return R.ok();
+
+ }
+
+
+ @PostMapping("/wrkMast/finish/v1")
+ @AppAuth(memo = "鍥涘悜杞︿换鍔″畬鎴�")
+ public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) ShuttleFinishParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ try {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("鍥涘悜搴撲换鍔℃湭鎵惧埌");
+ }
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10|| wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
+ wrkMast.setWrkSts(4L);
+ }else {
+ wrkMast.setWrkSts(14L);
+ }
+ if (!wrkMastService.updateById(wrkMast)){
+ return R.error();
+ }
+ }catch (Exception e) {
+ throw new CoolException(e);
+ }
+
+
+ return R.ok();
+ }
+
+
+
+ @PostMapping("/locDetl/select/time/v1")
+ 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,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ 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();
+ }
+
+
+
+ /****************************************************************************/
+ /********************************* 鎵撳寘涓婄嚎 **********************************/
+ /****************************************************************************/
+
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
+
+ /**
+ * 娣诲姞鍏ュ簱鍗�
+ */
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
+ public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ 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.pakinOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 鍏ュ簱鍗曞洖鍐�
+ */
+ @PostMapping("/order/pakin/complete/default/v1")
+ public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakinOrderComplete(param));
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
+ }
+ 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,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok().add(openService.queryStock());
+ }
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+// log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), 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鏃犺锛�");
+ }
+ }
+
+
+
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @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));
+ }
+
+
+ /*=============================================NEW===================================================*/
+ private void authNew(String appkey, Object obj, HttpServletRequest request, String url) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", url, appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
+ }
+ String authorization = request.getHeader("Authorization");
+ if (Cools.isEmpty(authorization)) {
+ authorization = request.getHeader("authorization");
+ }
+ if (!Cools.isEmpty(authorization)) {
+ String val = authorization.trim();
+ if (val.toLowerCase().startsWith("bearer")) {
+ int idx = val.indexOf(' ');
+ authorization = idx > -1 ? val.substring(idx + 1).trim() : "";
+ }else {
+ authorization = val;
+ }
+ }
+ if (!Cools.isEmpty(authorization)) {
+ if (validToken(authorization)) {
+ return;
+ }
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
+ }
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
+ }
+
+ public static boolean validToken(String authorization) {
+ if (Cools.isEmpty(authorization)) {
+ return false;
+ }
+ TokenVo tokenInfo = TOKEN_CACHE.get(authorization);
+ if (tokenInfo == null) {
+ return false;
+ }
+ if (System.currentTimeMillis() > tokenInfo.getValidTime()) {
+ TOKEN_CACHE.remove(authorization);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 鑾峰彇Token
+ * @param appkey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/getToken")
+ public synchronized R getToken(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) TokenParam param,
+ HttpServletRequest request){
+// authNew(appkey, param, request, "鑾峰彇Token:/getToken");
+ log.info("鑾峰彇Token:/getToken鎺ュ彛琚闂紝appkey={},璇锋眰鏁版嵁={}", appkey, JSON.toJSONString(param));
+ if (Cools.isEmpty(param)){
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String appId = param.getAppId();
+ String appSecret = param.getAppSecret();
+ if (Cools.isEmpty(appId)){
+ return R.error("鍙傛暟[appId]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(appSecret)){
+ return R.error("鍙傛暟[appSecret]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(openAppId) || Cools.isEmpty(openAppSecret)){
+ throw new CoolException("绯荤粺鏈厤缃畂pen-asrs.auth.app-id鎴杘pen-asrs.auth.app-secret");
+ }
+ if (!openAppId.equals(appId) || !openAppSecret.equals(appSecret)){
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鎴朼ppSecret鏃犺锛�");
+ }
+
+ String token = UUID.randomUUID().toString().replaceAll("-", "");
+ long expireAt = System.currentTimeMillis() + tokenValidMinutes * 60L *1000L;
+ TOKEN_CACHE.put(token, new TokenVo(appId, expireAt));
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("token", token);
+ result.put("expireAt", tokenValidMinutes);
+ return R.ok().add(result);
+ }
+
+ /**
+ *鐗╂枡鍩虹淇℃伅鍚屾
+ * @param appKey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/erp/mat/sync")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appKey,
+ @RequestBody(required = false) List<MatSyncParam.MatParam> param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "鐗╂枡鍩虹淇℃伅鍚屾:/erp/mat/sync");
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects = param;
+ matSyncParam.matDetails = objects;
+
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
+
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param appKey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/erp/order/add")
+ public synchronized R addOrder(@RequestHeader(required = false) String appKey,
+ @RequestBody OpenOrderParam param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "鍏�/鍑哄簱閫氱煡鍗曚笅鍙�:/erp/order/add");
+ 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.getWkType())){
+ return R.error("涓氬姟绫诲瀷[wkType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderItems())){
+ return R.error("璁㈠崟鏄庣粏[orderItems]涓嶈兘涓虹┖");
+ }
+ openService.orderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 搴撳瓨鏄庣粏鏌ヨ
+ * @param appKey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/erp/inventory/details")
+ public synchronized Result inventory(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨鏄庣粏鏌ヨ:/erp/inventory/details");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String locId = param == null ? null : param.getString("locId");
+ String matNr = param == null ? null : param.getString("matNr");
+ String orderNo = param == null ? null : param.getString("orderNo");
+ String batch = param == null ? null : param.getString("batch");
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.inventory(wareHouseId, locId, matNr, orderNo, batch));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+
+ /**
+ * 搴撳瓨姹囨�绘煡璇�
+ * @param appKey
+ * @param param
+ * @param request
+ * @return
+ */
+ @PostMapping("/erp/inventory/summary")
+ public synchronized Result invSummary(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨姹囨�绘煡璇�:/erp/inventory/summary");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String matNr = param == null ? null : param.getString("matNr");
+ Collection<String> matNrs = null;
+ if (!Cools.isEmpty(matNr)){
+ matNrs = Arrays.stream(matNr.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toList());
+ }
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.invSummary(wareHouseId, matNrs));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
+ }
+ }
}
--
Gitblit v1.9.1