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/service/impl/OpenServiceImpl.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 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 fbca18a..7083d97 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.OrderOutBatchUtil;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocTypeDto;
@@ -1120,7 +1121,8 @@
if (locDetl.getDanger()==0){
locDetl.setDanger(param.getDanger());
if (param.getDanger()==2){
- locDetl.setMemo(locDetl.getMemo()+"锛岃川妫�缁撴灉涓嶅悎鏍硷細"+param.getMemo());
+ String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"锛�";
+ locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"璐ㄦ缁撴灉涓嶅悎鏍硷細" + param.getMemo());//涓嶅悎鏍间細缁欏娉紝闇�瑕佹妸澶囨敞缁欏埌鍖呰鍋氬睍绀�
}
locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
.eq("loc_no", locDetl.getLocNo())
@@ -1130,5 +1132,64 @@
}
+// /*
+// * 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妤煎け璐�");
+//
+// }
+
+ /*
+ * 姝ｅ父閫�搴撹嚦浜屾ゼ鍖呰
+ * */
+ @Override
+ @Transactional
+ public R packagingAreaOrderCreate(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涓嬪彂閫�璐ц嚦浜屾ゼ","閫�璐ц嚦浜屾ゼ",false);
+ return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
+ }
+ } catch (Exception e) {
+ throw new CoolException("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�"+e.getMessage());
+ }
+ return R.error("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�");
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1