From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/asrs/controller/OrderCheckController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderCheckController.java b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
index dec9af9..674e0fc 100644
--- a/src/main/java/com/zy/asrs/controller/OrderCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
@@ -1,5 +1,8 @@
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;
@@ -8,10 +11,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CheckDTO;
-import com.zy.asrs.entity.param.MatnrDto;
-import com.zy.asrs.entity.param.OrderCheckParam;
-import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -25,9 +25,11 @@
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -59,6 +61,18 @@
@Autowired
private LocCheckTrimService locCheckTrimService;
+
+ @RequestMapping(value = "/orderCheck/examine")
+ @ManagerAuth(memo = "瀹℃牳鐩樼偣鍗�")
+ @Transactional
+ public R examine(@RequestBody ExamineParam param){
+ orderCheckService.examine(param);
+
+ return R.ok("瀹℃牳瀹屾垚");
+ }
+
+
+
@RequestMapping(value = "/orderCheck/nav/list/auth")
@ManagerAuth
@@ -132,9 +146,10 @@
orderCheck.setOrderTime(DateUtils.convert(now));
orderCheck.setStatus(1);
orderCheck.setSettle(1L);
- orderCheck.setDocType(23L);
+ orderCheck.setDocType(16L);
orderCheck.setCreateTime(now);
orderCheck.setUpdateTime(now);
+
if (!orderCheckService.insert(orderCheck)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曚富妗ｅけ璐�");
}
@@ -153,6 +168,7 @@
locCheck.setCreateTime(now);
locCheck.setUpdateTime(now);
locCheck.setOrderNo(param.getOrderNo());
+ locCheck.setBatch(manLocDetl.getBatch());
if (!locCheckService.insert(locCheck)){
return R.error("鎻掑叆澶辫触");
}
@@ -509,5 +525,37 @@
}
+ @RequestMapping(value = "/orderCheck/printExport/auth")
+ // @ManagerAuth(memo = "鐩樼偣鍗曞鍑�")
+ public void export(HttpServletResponse response,@RequestParam String orderNo) throws IOException {
+ //浠庢暟鎹簱鏌ヨ鏁版嵁
+ EntityWrapper<LocCheck> locCheckEntityWrapper = new EntityWrapper<>();
+ locCheckEntityWrapper.eq("order_no",orderNo);
+ List<LocCheck> list = locCheckService.selectList(locCheckEntityWrapper);
+ for (LocCheck locCheck:list){
+ locCheck.setRealAnfme(null);
+ }
+
+ 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");
+ Set<String> includeColumnFiledNames = new HashSet<String>();
+ includeColumnFiledNames.add("orderNo");
+ includeColumnFiledNames.add("matnr");
+ includeColumnFiledNames.add("maktx");
+ includeColumnFiledNames.add("locNo");
+ includeColumnFiledNames.add("anfme");
+ includeColumnFiledNames.add("owner");
+ includeColumnFiledNames.add("payment");
+ includeColumnFiledNames.add("createTime");
+ includeColumnFiledNames.add("realAnfme");
+ EasyExcel.write(response.getOutputStream(), LocCheck.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .includeColumnFiledNames(includeColumnFiledNames)
+ .sheet("琛�1")
+ .doWrite(list);
+ }
+
}
--
Gitblit v1.9.1