From e50218d4ba057a4a33af708ad13b8ef77c41e91c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 10:49:22 +0800
Subject: [PATCH] 订单追溯完善
---
src/main/java/com/zy/common/service/CommonService.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fc0c51e..4a39889 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -316,11 +316,7 @@
locMast = locMastList.get(0);
} else { // 濂囨暟锛屼笉鍙互鍏ュ簱
// 鑷姩缁欏墠闈换鍔¤ˉ灏炬《淇″彿
- if (wrkMast.getCtnType() == 0) {
- wrkMast.setCtnType(1);
- wrkMastService.updateById(wrkMast);
- log.info("鑷姩琛ュ熬妗朵俊鍙锋垚鍔�,浠诲姟鍙凤細{}",wrkMast.getCtnType());
- }
+ wrkMastService.updateCtnType(wrkMast);
log.error("-----涓庡墠闈㈡《绫诲瀷涓嶄竴鏍凤紝鍓嶉潰妗朵笉鏄熬妗讹紝鍓嶉潰璇ユ《绫诲瀷浠诲姟鏁颁笉鏄伓鏁帮紝涓嶈兘鍏ュ簱----");
throw new CoolException("涓庡墠闈㈡《绫诲瀷涓嶄竴鏍凤紝鍓嶉潰妗朵笉鏄熬妗讹紝鍓嶉潰璇ユ《绫诲瀷浠诲姟鏁颁笉鏄伓鏁帮紝涓嶈兘鍏ュ簱");
}
@@ -332,36 +328,65 @@
// 鍏ユ垚鍝佸簱鎽嗘斁瑙勫垯 鍒ゆ柇鍙敤鍫嗗灈鏈鸿嚜鍔�-鏃犳姤璀� 鎸夊眰鍒楁帓椤哄簭浠庝笅寰�涓婏紝浠庡墠寰�鍚庢帓 鍏堟繁搴撲綅鍦ㄦ祬搴撲綅 鏈�涓婇潰涓�灞傚彧鑳芥斁208L妗�(鍓╀綑搴撲綅杈惧埌涓�涓槇鍊�208L灏卞厛浠庢渶涓婇潰寮�濮嬫斁锛屼笅闈㈢暀缁欏叾浠栬揣鐗�-鍚庣画浼樺寲)
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).in("crn_no",1,2,3));
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).in("crn_no",1,2,3)
+ .eq("in_enable","Y"));
if (basCrnps.size() == 0) {
log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛屾病鏈夎仈鏈哄爢鍨涙満鎴栧爢鍨涙満寮傚父");
throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛屾病鏈夎仈鏈哄爢鍨涙満鎴栧爢鍨涙満寮傚父");
}
- List<Integer> crnList = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
+ List<BasCrnp> basCrnpList = new ArrayList<>();
+ for(BasCrnp basCrnp: basCrnps) {
+ Integer count = locMastMapper.selectCount(new EntityWrapper<LocMast>().eq("crn_no", basCrnp.getCrnNo()).eq("loc_sts", "S"));
+ basCrnp.setWrkNo(count);
+ basCrnpList.add(basCrnp);
+ }
+
+ basCrnpList = basCrnpList.stream().sorted(Comparator.comparing(BasCrnp::getWrkNo).thenComparing(BasCrnp::getCrnNo,((o1, o2) -> {
+ // 瀹氫箟 2 鈫� 3 鈫� 1 鐨勪紭鍏堢骇
+ int order1 = getCustomOrder(o1);
+ int order2 = getCustomOrder(o2);
+ return Integer.compare(order1, order2);
+ }))).collect(Collectors.toList());
// 鍏ュ簱妗跺瀷
String model = findLocNoAttributeVo.getModel();
- Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", 'O')
- .in("crn_no", crnList).orderBy("lev1").orderBy("bay1").orderBy("row1");
- // 鍏ュ簱妗跺瀷鏄笉鏄�208L
- if (model == null || !model.equals("208L")) {
- wrapper.ne("lev1", 11);
- }
- locMast = locMastService.selectOne(wrapper.in("row1", 1, 4, 5, 6, 7, 8));
- // 娣卞簱浣嶆病鏈変簡鍒欒幏鍙栦竴涓祬搴撲綅
- if (locMast == null) {
- locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
- if (locMast == null) {
- log.error("-----搴撲綅涓嶈冻----");
- throw new CoolException("搴撲綅涓嶈冻");
- } else {
- int count = locMastService.selectCount(wrapper.in("row1", 2, 3));
- if (count <= 10) {
- log.error("-----搴撲綅涓嶈冻锛岄鐣�10涓簱浣嶇敤鏉ュ簱浣嶈浆绉�----");
- throw new CoolException("搴撲綅涓嶈冻锛岄鐣�10涓簱浣嶇敤鏉ュ簱浣嶈浆绉�");
+
+ locMast = null;
+
+ for(BasCrnp basCrnp:basCrnpList) {
+ Integer crnNo = basCrnp.getCrnNo();
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", 'O')
+ .eq("crn_no", crnNo).orderBy("lev1").orderBy("bay1").orderBy("row1");
+ // 鍏ュ簱妗跺瀷鏄笉鏄�208L
+ if (model == null || !model.equals("208L")) {
+ wrapper.ne("lev1", 11);
+ }
+ if (crnNo == 1) {
+ wrapper.in("row1", 1, 4);
+ }
+ locMast = locMastService.selectOne(wrapper);
+ if (locMast != null) {
+ break;
+ }
+ // 娣卞簱浣嶆病鏈変簡鍒欒幏鍙栦竴涓祬搴撲綅
+ if (crnNo == 1) {
+ locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
+ if (locMast != null) {
+ int count = locMastService.selectCount(wrapper);
+ if (count <= 10) {
+ locMast = null;
+ } else {
+ break;
+ }
}
}
+ }
+
+ if (locMast == null) {
+ List<Integer> collect = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
+ log.error("-----{}鍫嗗灈鏈哄簱浣嶄笉瓒�----",collect.toString());
+ throw new CoolException(collect.toString() + "鍫嗗灈鏈哄簱浣嶄笉瓒�");
}
} else {
log.error("鍏ュ簱绫诲瀷閿欒锛宻taDescId={}", staDescId);
@@ -394,6 +419,16 @@
return startupDto;
}
+ // 杈呭姪鏂规硶锛氬畾涔� crn_no 鐨勬帓搴忎紭鍏堢骇
+ private static int getCustomOrder(Integer crnNo) {
+ switch (crnNo) {
+ case 2: return 1; // 2 鎺掔涓�
+ case 3: return 2; // 3 鎺掔浜�
+ case 1: return 3; // 1 鎺掔涓�
+ default: return 4; // 鍏朵粬鍊兼帓鏈�鍚庯紙濡傛灉鏈夛級
+ }
+ }
+
@Transactional(propagation = Propagation.REQUIRED)
public StartupDto getLocNo(SearchLocParam param, Integer staNo) {
--
Gitblit v1.9.1