From 5bfb795460d67c42b889557d79f96057f6cb3d3e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 12 三月 2026 10:55:58 +0800
Subject: [PATCH] 查询该零件二维码集合是否在一个托盘上
---
src/main/java/com/zy/asrs/controller/MesController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MesController.java b/src/main/java/com/zy/asrs/controller/MesController.java
index 47cf305..8f7b5c6 100644
--- a/src/main/java/com/zy/asrs/controller/MesController.java
+++ b/src/main/java/com/zy/asrs/controller/MesController.java
@@ -1,9 +1,11 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.service.MesService;
import com.zy.common.web.BaseController;
@@ -12,6 +14,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
@RestController
@Slf4j
@@ -25,15 +28,30 @@
request.setAttribute("cache", obj);
}
+ // 鏌ヨ璇ラ浂浠朵簩缁寸爜闆嗗悎鏄惁鍦ㄤ竴涓墭鐩樹笂
+ @PostMapping("/api/mes/FindPalletByItemNo")
+ @AppAuth(value = AppAuth.Auth.NONE, memo = "闆朵欢浜岀淮鐮佹槸鍚﹀湪涓�涓墭鐩樹笂")
+ public R FindPalletByItemNo(@RequestHeader(required = false) String appkey, @RequestBody List<String> param, HttpServletRequest request){
+ auth(appkey, param, request);
+ if(param.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ return mesService.FindPalletByItemNo(param);
+ }
+
// 鐗╂枡淇℃伅鍚屾
@PostMapping("/api/mes/synMatInfo")
@AppAuth(memo = "鐗╂枡淇℃伅鍚屾")
- public MesReturn synMatInfo(@RequestHeader(required = false) String appkey,@RequestBody MesMatRecvForm param, HttpServletRequest request){
+ public MesReturn synMatInfo(@RequestHeader(required = false) String appkey, @RequestBody List<MesMatRecvForm> param, HttpServletRequest request){
auth(appkey, param, request);
MesReturn mesReturn = new MesReturn();
try {
- mesReturn = mesService.matInfoAndInBound(param);
+ for(MesMatRecvForm matRecvForm:param) {
+ mesReturn = mesService.matInfoAndInBound(matRecvForm);
+ }
} catch (Exception e) {
+ e.printStackTrace();
mesReturn.setSuccess("2");
mesReturn.setMessage("鐗╂枡淇℃伅鍚屾澶辫触");
}
--
Gitblit v1.9.1