From dfdf98629fa109a18a76bcc00a63a812c4ecbcaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:01:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java | 16 ++++++++++------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 7 deletions(-)
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 09322fe..7083d97 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1132,6 +1132,36 @@
}
+// /*
+// * FQC璐ㄦ 閫�搴撹嚦2妤�
+// * */
+// @Override
+// @Transactional
+// public R qualityInspection(QualityInspectionParam param) {
+// try{
+//// String[] split = param.getModel().split(",");
+//// if (Cools.isEmpty(split)){
+//// throw new CoolException("鍙傛暟锛氬嵎鍙� Model涓虹┖,瑙ｆ瀽澶辫触锛侊紒锛�");
+//// }
+// List<String[]> OutLocBoxCs = new ArrayList<>();
+// String orderNo = "TK" + snowflakeIdWorker.nextId();
+// String cstmrName = "鏈煡";
+//// for (String model:split){
+// String[] outLocBox = new String[]{param.getBoxNo(),orderNo,cstmrName,param.getMemo(),"涓嶅悎鏍�"};
+// OutLocBoxCs.add(outLocBox);
+//// }
+//
+// if (!OutLocBoxCs.isEmpty()){
+// OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES涓嬪彂涓嶅悎鏍奸��璐�","涓嶅悎鏍奸��璐�",true);
+// return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
+// }
+// } catch (Exception e) {
+// throw new CoolException("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�"+e.getMessage());
+// }
+// return R.error("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�");
+//
+// }
+
/*
* 姝ｅ父閫�搴撹嚦浜屾ゼ鍖呰
* */
@@ -1152,7 +1182,7 @@
// }
if (!OutLocBoxCs.isEmpty()){
- OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES涓嬪彂閫�璐ц嚦浜屾ゼ","閫�璐ц嚦浜屾ゼ");
+ OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES涓嬪彂閫�璐ц嚦浜屾ゼ","閫�璐ц嚦浜屾ゼ",false);
return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
index d0ed13f..cc9d61e 100644
--- a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
@@ -31,6 +31,7 @@
private String action = "";
private String orderName = "";
private Long userId = 9999L;
+ private boolean signDanger = true;
public OrderOutBatchUtil() {
@@ -45,7 +46,7 @@
this.cstmrName = cstmrName;
}
- public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName) {
+ public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName,boolean signDanger) {
this.errorMsgOrderLoc = "";
this.sign = true;
this.orderOneNo = orderOneNo;
@@ -54,6 +55,7 @@
this.action = action;
this.orderName = orderName;
this.userId = 9999L;
+ this.signDanger = signDanger;
}
public R setOrderOutBatch() {
@@ -81,11 +83,13 @@
continue;
// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
-// if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
-// sign = false;
-// errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC[4] + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
-// continue;
-// }
+ if (signDanger){
+ if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC[4] + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
+ continue;
+ }
+ }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
if (Cools.isEmpty(locMast)) {
sign = false;
--
Gitblit v1.9.1