From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index e001475..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;
@@ -40,6 +42,8 @@
@Autowired
private MatCodeService matCodeService;
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
@@ -92,6 +96,7 @@
matCode.setModiTime(new Date());
matCode.setAppeUser(getUserId());
matCode.setAppeTime(new Date());
+ // matCode.setMatNo(UUID.randomUUID().toString().replaceAll("-", ""));
matCodeService.insert(matCode);
return R.ok();
}
@@ -116,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();
@@ -123,11 +132,18 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ @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);
@@ -138,7 +154,7 @@
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
+ fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"浜у搧浠ｅ彿":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -148,17 +164,17 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "浜у搧浠ｅ彿鏁版嵁瀵煎叆")
@Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉′骇鍝佷俊鎭�");
}
// 鎵撳嵃
@RequestMapping(value = "/matCode/print/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+ @ManagerAuth(memo = "浜у搧浠ｅ彿鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
@@ -179,7 +195,7 @@
}
@RequestMapping(value = "/macCode/code/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+// @ManagerAuth(memo = "浜у搧浠ｅ彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
, @RequestParam String param
, HttpServletResponse response) throws Exception {
@@ -227,4 +243,24 @@
return R.ok();
}
+ @RequestMapping("/matType/auth")
+ public R type(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (int i = 1; i < 4; i++) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id",i+"");
+ if (i == 1){
+ item.put("value","鍘熸潗鏂�");
+ }
+ if (i == 2){
+ item.put("value","鎴愬搧");
+ }
+ if (i == 3){
+ item.put("value","鍗婃垚鍝�");
+ }
+ result.add(item);
+ }
+
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.1