From d759220378927d1481882de1c7c476ac47ce2dea Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 21:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 c3cc1ee..7a49786 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
@@ -93,11 +94,28 @@
@ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
public R update(WrkMast wrkMast){
if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
- return R.error();
+ return R.error("宸ヤ綔鍙峰紓甯�");
+ }else if (wrkMast.getWrkSts()==null){
+ return R.error("淇敼鐘舵�佸紓甯�");
}
- wrkMast.setModiUser(getUserId());
- wrkMast.setModiTime(new Date());
- wrkMastService.updateById(wrkMast);
+ WrkMast wrkMast1=null;
+ try{
+ wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
+ return R.error("宸ヤ綔鍙峰紓甯�");
+ }else if (wrkMast1.getWrkSts()==null){
+ return R.error("淇敼鐘舵�佸紓甯�");
+ }
+ }catch (Exception e){
+ return R.error("鏌ヨ宸ヤ綔妗ｅけ璐ワ紝璇峰皾璇曞埛鏂伴〉闈€��");
+ }
+ if (wrkMast1.getWrkSts()==wrkMast.getWrkSts()){
+ return R.error("鎵�閫夌姸鎬佷笌姝ゅ伐浣滄。鐘舵�佷竴鑷达紝鏃犻渶淇敼");
+ }
+ wrkMast1.setModiUser(getUserId());
+ wrkMast1.setModiTime(new Date());
+ wrkMast1.setWrkSts(wrkMast.getWrkSts());
+ wrkMastService.updateById(wrkMast1);
return R.ok();
}
@@ -179,6 +197,7 @@
/********************************杈归攱鏂板**************************/
+
@GetMapping(value = "/wrkMast/checkDetl")
public R pickDetl(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
--
Gitblit v1.9.1