From 4e237c87a21438b1fc115d344dfb0362747d14bb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 九月 2024 14:19:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PakoutController.java | 80 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PakoutController.java b/src/main/java/com/zy/asrs/controller/PakoutController.java
index fe360e4..1e65ee5 100644
--- a/src/main/java/com/zy/asrs/controller/PakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/PakoutController.java
@@ -1,29 +1,29 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
+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;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.Pakout;
-import com.zy.asrs.entity.param.OrderDomainParam;
-import com.zy.asrs.service.ManLocDetlService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.PakoutService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.PakoutVo;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -37,6 +37,8 @@
private OrderDetlService orderDetlService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private PlaService plaService;
@RequestMapping(value = "/pakout/{id}/auth")
@ManagerAuth
@@ -54,6 +56,12 @@
EntityWrapper<Pakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+
+ User user = getUser();
+ if (user.getRoleId() != 2 || user.getRoleId() != 24) {
+ wrapper.eq("create_by", user.getId());
+ }
+
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(pakoutService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -66,7 +74,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -289,7 +297,22 @@
@RequestMapping(value = "/pakout/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
public R delete(@RequestParam String docNum){
- pakoutService.deletePakout(docNum);
+ try{
+ pakoutService.deletePakout(docNum);
+ }catch (Exception e){
+ return R.error(e+"");
+ }
+ return R.ok("鎷ｈ揣鍗曞垹闄ゆ垚鍔�");
+ }
+
+ @RequestMapping(value = "/pakout/deleteDetl/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ public R deleteDetl(@RequestParam String wrkNo){
+ try{
+ pakoutService.deletePakoutByWrkNo(wrkNo);
+ }catch (Exception e){
+ return R.error(e+"");
+ }
return R.ok("鎷ｈ揣鍗曞垹闄ゆ垚鍔�");
}
@@ -330,4 +353,33 @@
return R.ok();
}
+ @RequestMapping(value = "/pakout/printExport/auth")
+ // @ManagerAuth(memo = "鐩樼偣鍗曞鍑�")
+ public void export(HttpServletResponse response, @RequestParam String orderNo) throws IOException {
+ //浠庢暟鎹簱鏌ヨ鏁版嵁
+ EntityWrapper<Pakout> locCheckEntityWrapper = new EntityWrapper<>();
+ locCheckEntityWrapper.eq("doc_num",orderNo);
+ List<Pakout> list = pakoutService.selectList(locCheckEntityWrapper);
+ List<PakoutVo> pakoutVos=new ArrayList<>();
+
+ for (Pakout pakout: list) {
+ PakoutVo pakoutVo = new PakoutVo();
+ Pla pla = plaService.selectOne(new EntityWrapper<Pla>()
+ .eq("batch", pakout.getBatch())
+ .eq("package_no", pakout.getBarcode())
+ .eq("brand", pakout.getMaktx()));
+ BeanUtils.copyProperties(pla,pakoutVo);
+ BeanUtils.copyProperties(pakout,pakoutVo);
+ pakoutVos.add(pakoutVo);
+ }
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("鎷ｈ揣鍗�", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName+ orderNo + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), PakoutVo.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(pakoutVos);
+ }
+
}
--
Gitblit v1.9.1