From ccf149086fc5f568e3ee7289c2426a6bbb2a31c7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 08:47:01 +0800
Subject: [PATCH] # 出库确认
---
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 7fa8019..c62aa2b 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -50,43 +50,47 @@
return;
}
for (BasCrnp basCrnp:basCrnps){
- if (basCrnp.getCrnSts()!=3) continue;
- if (!basCrnp.getInEnable().equals("N") || !basCrnp.getOutEnable().equals("Y")) continue;
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",basCrnp.getCrnNo()));
- if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
- LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",basCrnp.getCrnNo()).orderBy("appe_time",true));//绌烘澘鎵�鍦�
- if (Cools.isEmpty(locMastStart)){
- continue;
- }
- if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())){
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
- LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (!locNo.getLocSts().equals("O")){
- locMastStart = locNo;
- }
- }
- LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("crn_no",basCrnp.getCrnNo()).ne("modi_user",66).orderBy("row1",true));//鐩爣
- if (Cools.isEmpty(locMastEnd)){
- continue;
- }
- if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())){
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
- LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
- if (locNo.getLocSts().equals("O")){
+ try{
+ if (basCrnp.getCrnSts()!=3) continue;
+ if (!basCrnp.getInEnable().equals("N") || !basCrnp.getOutEnable().equals("Y")) continue;
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",basCrnp.getCrnNo()));
+ if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
+ LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",basCrnp.getCrnNo()).orderBy("appe_time",true));//绌烘澘鎵�鍦�
+ if (Cools.isEmpty(locMastStart)){
+ continue;
+ }
+ if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())){
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
+ LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
+ if (!locNo.getLocSts().equals("O")){
+ locMastStart = locNo;
+ }
+ }
+ LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("crn_no",basCrnp.getCrnNo()).ne("modi_user",66).orderBy("row1",true));//鐩爣
+ if (Cools.isEmpty(locMastEnd)){
+ continue;
+ }
+ if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())){
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
+ LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
+ if (locNo.getLocSts().equals("O")){
- }else {
- locMastEnd.setModiUser(66L);
- locMastService.updateById(locMastEnd);
- continue;
- }
- }
+ }else {
+ locMastEnd.setModiUser(66L);
+ locMastService.updateById(locMastEnd);
+ continue;
+ }
+ }
// if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){
- ReturnT<String> result = locMoveAllHandler.start(locMastStart,locMastEnd,basCrnp.getCrnNo());
- if (!result.isSuccess()) {
- log.error("澶勭悊澶辫触");
- }
- }
+ ReturnT<String> result = locMoveAllHandler.start(locMastStart,locMastEnd,basCrnp.getCrnNo());
+ if (!result.isSuccess()) {
+ log.error("澶勭悊澶辫触");
+ }
+ }
+ }catch (Exception e){
+ log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
}
}
--
Gitblit v1.9.1