From ec7342d38bb1ca9f5b4e08f4901aa10a3b8d7265 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 07 十月 2023 11:55:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 11 +++++++----
1 files changed, 7 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 8b1f0d1..f0e1096 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -14,6 +15,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
+import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,7 @@
}else {
wrapper.orderBy("io_time", false);
}
+ wrkMastService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -123,6 +126,9 @@
}
public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
+ if (wrkSts1>20){
+ throw new CoolException("澶т簬20鐨勭姸鎬佷笉鑳借繘琛屼慨鏀癸紒锛侊紒");
+ }
switch (wrkMast1.getIoType()){
case 1:
case 10:
@@ -142,8 +148,6 @@
throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
}
}
- return false;
- }else if (wrkSts1>20){
return false;
}
return true;
@@ -165,8 +169,6 @@
throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗ｆ墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
}
}
- return false;
- }else if (wrkSts1>20){
return false;
}
return true;
@@ -419,6 +421,7 @@
wrkDetl.setModiTime(now);
wrkDetl.setAppeUser(1L);
wrkDetl.setModiUser(1L);
+ wrkDetl.setMatType(locDetl.getMatType());
wrkDetlService.insert(wrkDetl);
}
--
Gitblit v1.9.1