From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 82d0a76..85d7f80 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -12,8 +12,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
@@ -23,7 +25,6 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,8 @@
@Autowired
private MatCodeService matCodeService;
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
@@ -93,7 +96,7 @@
matCode.setModiTime(new Date());
matCode.setAppeUser(getUserId());
matCode.setAppeTime(new Date());
- matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
+ // matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
matCodeService.insert(matCode);
return R.ok();
}
@@ -118,6 +121,10 @@
return R.error();
}
for (MatCode entity : list){
+ Integer count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("mat_no",entity.getMatNo()));
+ if(count>0){
+ return R.error("浜у搧缂栫爜" + entity.getMatNo() + "鍦ㄥ簱瀛樹腑宸插瓨鍦紝绂佹鍒犻櫎");
+ }
matCodeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -128,8 +135,15 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "浜у搧浠ｅ彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
+ @RequestParam(required = false) String ids,
HttpServletResponse response) throws Exception {
- List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+ List<MatCode> list = null;
+ if(!Cools.isEmpty(ids)){
+ list = matCodeService.selectList(new EntityWrapper<MatCode>().last("where mat_no in (" + ids + ")"));
+ }else{
+ list = matCodeService.selectList(new EntityWrapper<>());
+ }
+// List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
MatCodeExcel excel = VersionUtils.getExcel(matCode);
--
Gitblit v1.9.1