From 24e8a9a3d7ca365bbda7b513db34f6fa89e8e561 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 29 四月 2025 09:07:45 +0800
Subject: [PATCH] 产品合格校验MES调用
---
src/main/java/com/zy/asrs/controller/OpenController.java | 5 ++---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 ++++++++++------------
src/main/java/com/zy/asrs/entity/param/ProdCheckParam.java | 13 ++-----------
src/main/java/com/zy/asrs/service/OpenService.java | 2 +-
4 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0281bfa..5902ae2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -160,8 +160,7 @@
@RequestBody List<ProdCheckParam> param,
HttpServletRequest request) {
auth(appkey, param, request);
- openService.prodCheck(param);
- return R.ok();
+ return openService.prodCheck(param);
}
@PostMapping("/xhd")
@@ -318,7 +317,7 @@
}*/
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("OpenController绫�:銆恵}銆戞帴鍙ｈ璁块棶;appkey:銆恵}銆�;璇锋眰鏁版嵁锛氥�恵}銆�", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
diff --git a/src/main/java/com/zy/asrs/entity/param/ProdCheckParam.java b/src/main/java/com/zy/asrs/entity/param/ProdCheckParam.java
index 9682c63..b8e23e3 100644
--- a/src/main/java/com/zy/asrs/entity/param/ProdCheckParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ProdCheckParam.java
@@ -11,22 +11,13 @@
public class ProdCheckParam {
/**
- * 鍖呰缁勫彿
- */
- private String packageGroupNo;
-
- /**
* 鍗峰彿
*/
private String rollNo;
/**
- * 绠卞彿
- */
- private String boxNo;
-
- /**
- * 鍚堟牸 鏄�/鍚�
+ * 鍚堟牸 鍚堟牸/涓嶅悎鏍�
*/
private String qualified;
+
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 3327d99..7d2cc7d 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -18,7 +18,7 @@
/**
* 浜у搧鍚堟牸鏍￠獙
*/
- void prodCheck(List<ProdCheckParam> param);
+ R prodCheck(List<ProdCheckParam> param);
/**
* 鍙嶄慨鍝佸叆搴�
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index dc18ea9..df5f418 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1025,29 +1025,27 @@
@Override
@Transactional
- public void prodCheck(List<ProdCheckParam> param) {
+ public R prodCheck(List<ProdCheckParam> param) {
if (param.isEmpty()) {
- throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ return R.parse("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
for (ProdCheckParam checkParam : param) {
// 鏇存柊搴撳瓨鏄庣粏鏄惁鍚堟牸
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
- .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", checkParam.getRollNo()));
// 鏇存柊鍟嗗搧琛ㄦ槸鍚﹀悎鏍�
- Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
- .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
- if (locDetl == null || mat == null) {
+// Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("model", checkParam.getRollNo()));
+ if (locDetl == null) { // || mat == null
throw new CoolException("鏇存柊鏄惁鍚堟牸鐗╂枡涓嶅瓨鍦細" + checkParam);
}
locDetl.setThreeCode(checkParam.getQualified());
- mat.setThreeCode(checkParam.getQualified());
+// mat.setThreeCode(checkParam.getQualified());
- locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
- .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
- matService.update(mat,(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
- .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo())));
+ locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("model", checkParam.getRollNo()));
+// matService.update(mat, (new EntityWrapper<Mat>().eq("model", checkParam.getRollNo())));
}
+
+ return R.ok("鏇存柊鎴愬姛");
}
@Override
--
Gitblit v1.9.1