From a5381945bfbafbdd2d2d4703500620f0f5f5d413 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 16 三月 2026 10:07:29 +0800
Subject: [PATCH] #erp接口对接
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 10 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 98 +++++++++++++++++++++++++++++++-
src/main/resources/mapper/LocDetlMapper.xml | 55 ++++++++++++++++++
3 files changed, 160 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 cb34a46..2c6d016 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,14 @@
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.mapper.LocDetlMapper;
import com.zy.asrs.service.OpenService;
+import com.zy.common.service.wms.Result;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -13,9 +16,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/8
@@ -24,6 +27,10 @@
@RestController
@RequestMapping("open/asrs")
public class OpenController extends BaseController {
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
+ private static final String MES_WAREHOUSE_ID = "WH01";
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -151,6 +158,91 @@
return R.ok().add(openService.queryStock());
}
+
+ @PostMapping(value = "/MES/inventory/details", consumes = "application/json;charset=UTF-8", produces = "application/json;charset=UTF-8")
+ public Result details(@RequestBody(required = false) JSONObject body) {
+ try {
+ String wareHouseId = body == null ? null : body.getString("wareHouseId");
+ String locId = body == null ? null : body.getString("locId");
+ String matNr = body == null ? null : body.getString("matNr");
+ String orderNo = body == null ? null : body.getString("orderNo");
+ String batch = body == null ? null : body.getString("batch");
+ if (!Cools.isEmpty(wareHouseId) && !MES_WAREHOUSE_ID.equalsIgnoreCase(wareHouseId)) {
+ return new Result(200, "鎿嶄綔鎴愬姛", Collections.emptyList());
+ }
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.mesInventoryDetails(wareHouseId, locId, matNr, orderNo, batch));
+ } catch (Exception e) {
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+
+ @PostMapping(value = "/MES/inventory/summary", consumes = "application/json;charset=UTF-8", produces = "application/json;charset=UTF-8")
+ public Result summary(@RequestBody(required = false) JSONObject body) {
+ try {
+ String wareHouseId = body == null ? null : body.getString("wareHouseId");
+ String matNr = body == null ? null : body.getString("matNr");
+ if (!Cools.isEmpty(wareHouseId) && !MES_WAREHOUSE_ID.equalsIgnoreCase(wareHouseId)) {
+ return new Result(200, "鎿嶄綔鎴愬姛", Collections.emptyList());
+ }
+ 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.mesInventorySummary(wareHouseId, matNrs));
+ } catch (Exception e) {
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+
+ @RestController
+ @RequestMapping("/MES/inventory")
+ public static class MesInventoryController {
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
+ @PostMapping(value = "/details", consumes = "application/json;charset=UTF-8", produces = "application/json;charset=UTF-8")
+ public Result details(@RequestBody(required = false) JSONObject body) {
+ try {
+ String wareHouseId = body == null ? null : body.getString("wareHouseId");
+ String locId = body == null ? null : body.getString("locId");
+ String matNr = body == null ? null : body.getString("matNr");
+ String orderNo = body == null ? null : body.getString("orderNo");
+ String batch = body == null ? null : body.getString("batch");
+ if (!Cools.isEmpty(wareHouseId) && !MES_WAREHOUSE_ID.equalsIgnoreCase(wareHouseId)) {
+ return new Result(200, "鎿嶄綔鎴愬姛", Collections.emptyList());
+ }
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.mesInventoryDetails(wareHouseId, locId, matNr, orderNo, batch));
+ } catch (Exception e) {
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+
+ @PostMapping(value = "/summary", consumes = "application/json;charset=UTF-8", produces = "application/json;charset=UTF-8")
+ public Result summary(@RequestBody(required = false) JSONObject body) {
+ try {
+ String wareHouseId = body == null ? null : body.getString("wareHouseId");
+ String matNr = body == null ? null : body.getString("matNr");
+ if (!Cools.isEmpty(wareHouseId) && !MES_WAREHOUSE_ID.equalsIgnoreCase(wareHouseId)) {
+ return new Result(200, "鎿嶄綔鎴愬姛", Collections.emptyList());
+ }
+ 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.mesInventorySummary(wareHouseId, matNrs));
+ } catch (Exception e) {
+ return new Result(500, e.getMessage(), null);
+ }
+ }
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 771b750..643debf 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -69,4 +70,13 @@
void updateMatTurn(@Param("matnrOld")String matnrOld,@Param("matnr")String matnr);
+ List<Map<String, Object>> mesInventoryDetails(@Param("wareHouseId") String wareHouseId,
+ @Param("locId") String locId,
+ @Param("matNr") String matNr,
+ @Param("orderNo") String orderNo,
+ @Param("batch") String batch);
+
+ List<Map<String, Object>> mesInventorySummary(@Param("wareHouseId") String wareHouseId,
+ @Param("matNrs") Collection<String> matNrs);
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d41392b..800c321 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -336,5 +336,60 @@
INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
</update>
+ <select id="mesInventoryDetails" resultType="java.util.HashMap">
+ select
+ ld.loc_no as locId,
+ 'WH01' as wareHouseId,
+ '浠撳簱1' as wareHouseName,
+ ld.zpallet as palletId,
+ ld.matnr as matNr,
+ coalesce(m.maktx, ld.maktx) as makTx,
+ cast(round(ld.anfme, 4) as decimal(18, 4)) as anfme,
+ coalesce(m.unit, ld.unit) as unit,
+ 1 as status,
+ isnull(ld.batch, '') as batch
+ from asr_loc_detl ld
+ left join asr_loc_mast lm on ld.loc_no = lm.loc_no
+ left join man_mat m on ld.matnr = m.matnr
+ where 1=1
+ and lm.loc_sts = 'F'
+ <if test="locId != null and locId != ''">
+ and ld.loc_no = #{locId}
+ </if>
+ <if test="matNr != null and matNr != ''">
+ and ld.matnr = #{matNr}
+ </if>
+ <if test="orderNo != null and orderNo != ''">
+ and ld.order_no = #{orderNo}
+ </if>
+ <if test="batch != null and batch != ''">
+ and ld.batch = #{batch}
+ </if>
+ order by ld.loc_no, ld.zpallet, ld.matnr
+ </select>
+
+ <select id="mesInventorySummary" resultType="java.util.HashMap">
+ select
+ 'WH01' as wareHouseId,
+ '浠撳簱1' as wareHouseName,
+ ld.matnr as matNr,
+ coalesce(max(m.maktx), max(ld.maktx)) as matTx,
+ cast(round(sum(ld.anfme), 4) as decimal(18, 4)) as anfme,
+ coalesce(max(m.unit), max(ld.unit)) as unit
+ from asr_loc_detl ld
+ left join asr_loc_mast lm on ld.loc_no = lm.loc_no
+ left join man_mat m on ld.matnr = m.matnr
+ where 1=1
+ and lm.loc_sts = 'F'
+ <if test="matNrs != null and matNrs.size > 0">
+ and ld.matnr in
+ <foreach item="item" collection="matNrs" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ group by ld.matnr
+ order by ld.matnr
+ </select>
+
</mapper>
--
Gitblit v1.9.1