From 6a15538091b08cbcdb0f5223d7a7967542c0bb04 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 90 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 7a49786..3f05251 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -102,15 +102,18 @@
try{
wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
- return R.error("宸ヤ綔鍙峰紓甯�");
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"鎵�灞炲伐浣滄。鏌ヨ澶辫触");
}else if (wrkMast1.getWrkSts()==null){
- return R.error("淇敼鐘舵�佸紓甯�");
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"鎵�灞炲伐浣滄。鐘舵�佸紓甯�");
}
}catch (Exception e){
- return R.error("鏌ヨ宸ヤ綔妗ｅけ璐ワ紝璇峰皾璇曞埛鏂伴〉闈€��");
+ return R.error("澶辫触!!!璇峰皾璇曞埛鏂伴〉闈€��"+"寮傚父鍘熷洜锛�"+e);
}
- if (wrkMast1.getWrkSts()==wrkMast.getWrkSts()){
+ if (wrkMast1.getWrkSts()-wrkMast.getWrkSts()==0){
return R.error("鎵�閫夌姸鎬佷笌姝ゅ伐浣滄。鐘舵�佷竴鑷达紝鏃犻渶淇敼");
+ }
+ if (juBge(wrkMast.getWrkSts(), wrkMast1)){
+ return R.error("淇敼鐘舵�佸け璐ワ紝璇疯鑼冩搷浣�");
}
wrkMast1.setModiUser(getUserId());
wrkMast1.setModiTime(new Date());
@@ -119,6 +122,85 @@
return R.ok();
}
+ public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
+ if (wrkSts1>20){
+ throw new CoolException("澶т簬20鐨勭姸鎬佷笉鑳借繘琛屼慨鏀癸紒锛侊紒");
+ }
+ switch (wrkMast1.getIoType()){
+ case 1:
+ case 10:
+ case 53:
+ case 54:
+ case 57:
+ if (wrkSts1>=1 && wrkSts1<=10){
+ if (wrkSts1==10){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getLocNo()));
+ if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅紓甯歌缁存姢搴撲綅鏁版嵁");
+ }
+ if (locMast.getLocSts().equals("S")||locMast.getLocSts().equals("Q")){
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佷负"+locMast.getLocSts$()+"锛岃缁存姢搴撲綅鏁版嵁");
+ }else if (locMast.getLocSts().equals("F")){
+ }else {
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
+ }
+ }
+ return false;
+ }
+ return true;
+ case 101:
+ case 103:
+ case 104:
+ case 107:
+ case 110:
+ if (wrkSts1>=11 && wrkSts1<=18){
+ if (wrkSts1==18){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
+ if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅紓甯歌缁存姢搴撲綅鏁版嵁");
+ }
+ if (locMast.getLocSts().equals("R")||locMast.getLocSts().equals("P")){
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佷负"+locMast.getLocSts$()+"锛岃缁存姢搴撲綅鏁版嵁");
+ }else if (locMast.getLocSts().equals("O")){
+ }else {
+ throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
+ }
+ }
+ return false;
+ }
+ return true;
+ case 11:
+ return false;
+ case 3:
+ case 6:
+ default:
+ return true;
+ }
+ }
+ private void doOut(WrkMast wrkMast,LocMast locMast){
+ try{
+ Date now = new Date();
+ // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
+ if (locMast.getLocSts().equals("R")) {
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setFrozen(0);
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ locMast.setFrozenMemo("");
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("淇敼婧愬簱浣嶇姸鎬佸け璐�:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
+ }
+ }
+ }catch (Exception e){
+ throw new CoolException(e+"鎿嶄綔澶辫触");
+ }
+ }
+
@RequestMapping(value = "/wrkMast/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
public R delete(@RequestParam String param){
--
Gitblit v1.9.1