From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 8ce0fd0..383bf73 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -45,52 +45,56 @@
@Autowired
private BasCrnpService basCrnpService;
- public ReturnT<String> start(Integer ioType,Integer staNo,String locStsTarget) {
+ public ReturnT<String> start(Integer ioType, Integer staNo, String locStsTarget) {
try {
- if (wrkMastService.selectWrkMastBareBoardStaNo(ioType,staNo)!=0){
+ if (wrkMastService.selectWrkMastBareBoardStaNo(ioType, staNo) != 0) {
return null;
}
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- ArrayList<Integer> crns =new ArrayList<>();
+ ArrayList<Integer> crns = new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("out_enable", "Y").eq("wrk_no", 0));
- for (BasCrnp basCrnp : basCrnps){
+ for (BasCrnp basCrnp : basCrnps) {
crns.add(basCrnp.getCrnNo());
}
- for (BasCrnp basCrnp : basCrnpService.selectList(new EntityWrapper<>())){
+ for (BasCrnp basCrnp : basCrnpService.selectList(new EntityWrapper<>())) {
crns.add(basCrnp.getCrnNo());
}
- if (Cools.isEmpty(crns) || crns.size()==0){
+ if (Cools.isEmpty(crns) || crns.size() == 0) {
return null;
}
boolean sign = true;
- for (Integer crnNo : crns){
+ for (Integer crnNo : crns) {
sign = true;
- // 鑾峰彇搴撲綅
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));
+
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", locStsTarget).eq("crn_no", crnNo));
if (Cools.isEmpty(locMast)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
- sign=false;
+ sign = false;
}
- if (sign && !locMast.getLocSts().equals(locStsTarget)){
+ if (sign && !locMast.getLocSts().equals(locStsTarget)) {
// throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
- sign=false;
+ sign = false;
}
- if (sign){
+ if (sign) {
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
.eq("stn_no", staNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ sign = false;
+ continue;
+ }
Integer sourceStaNo = staDesc.getCrnStn();
if (Cools.isEmpty(sourceStaNo)) {
// throw new CoolException("妫�绱㈡簮绔欏け璐�");
sign = false;
}
- if (sign){
+ if (sign) {
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -103,10 +107,10 @@
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt(ioType.equals(110)? "N" : "Y"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(ioType.equals(110) ? "N" : "Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(ioType.equals(110)? "Y" : "N"); // 绌烘澘
+ wrkMast.setEmptyMk(ioType.equals(110) ? "Y" : "N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(9999L);
wrkMast.setAppeTime(now);
@@ -117,25 +121,25 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals(locStsTarget)){
+ if (locMast.getLocSts().equals(locStsTarget)) {
locMast.setLocSts("R");
locMast.setModiUser(9999L);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
- }else {
+ } else {
return SUCCESS;
}
}
}
}
}
- if (!sign){
+ if (!sign) {
log.error("鏈煡鍒板彲鍑哄簱鐨勭┖鏉匡紒锛侊紒");
return null;
}
- }catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ } catch (Exception e) {
+ log.error("寮傚父锛侊紒锛�" + e);
return null;
}
return SUCCESS;
--
Gitblit v1.9.1