From ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/controller/LocRuleController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java
index 017f75b..4d75e61 100644
--- a/src/main/java/com/zy/asrs/controller/LocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,10 +14,18 @@
import com.zy.asrs.entity.LocRule;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocRuleService;
+import com.zy.asrs.service.NodeService;
+import com.zy.asrs.utils.LocRuleExcelListener;
+import com.zy.common.entity.LocRuleExcel;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -25,6 +35,8 @@
private LocRuleService locRuleService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private NodeService nodeService;
@RequestMapping(value = "/locRule/{id}/auth")
@ManagerAuth
@@ -80,11 +92,11 @@
locRule.setUpdateBy(getUserId());
locRule.setUpdateTime(now);
Integer locType2 = 1;//鍗曞搧鍖哄煙
- if (locRule.getMixed() == 1) {
- //娣疯浇
- locRule.setMatnr("00000000");
- locType2 = 2;//娣锋斁鍖哄煙
- }
+// if (locRule.getMixed() == 1) {
+// //娣疯浇
+// //locRule.setMatnr("00000000");
+// locType2 = 2;//娣锋斁鍖哄煙
+// }
locRuleService.insert(locRule);
locMastService.updateLocType2ByRBL(locType2, locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
return R.ok();
@@ -109,7 +121,7 @@
locRule.setUpdateTime(new Date());
locRuleService.updateById(locRule);
Integer locType2 = 1;//鍗曞搧鍖哄煙
- if (locRule.getMixed() == 0) {
+ if (Cools.isEmpty(locRule.getMixed()) || locRule.getMixed() == 0) {
locRuleService.updateKeepGoByMatnr(locRule.getMatnr(), locRule.getKeepGo());
}else {//娣疯浇
locRuleService.updateKeepGoByMixed(locRule.getKeepGo());
@@ -167,4 +179,34 @@
return R.ok();
}
+ /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/locCodeRule/excel/import/mould")
+ public void matExcelImportMould(HttpServletResponse response) throws IOException {
+ List<LocRuleExcel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("搴撲綅缂栫爜瑙勫垯Excel瀵煎叆妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), LocRuleExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excels);
+ }
+
+ // excel瀵煎叆
+ @PostMapping(value = "/locCodeRule/excel/import/auth")
+ @ManagerAuth(memo = "搴撲綅缂栫爜瑙勫垯鏁版嵁瀵煎叆")
+ @Transactional
+ public R matExcelImport(MultipartFile file) throws IOException {
+ LocRuleExcelListener listener = new LocRuleExcelListener();
+ EasyExcel.read(file.getInputStream(), LocRuleExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ }
+
+
+
}
--
Gitblit v1.9.1