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/ManLocDetlController.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 2773e4e..a9298cf 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,22 +1,32 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
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.ManLocDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.service.LocCheckService;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
+import com.zy.asrs.service.MatService;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
import java.util.Map;
@RestController
@@ -24,6 +34,26 @@
@Autowired
private ManLocDetlService manLocDetlService;
+
+ @Autowired
+ private LocDetlService locDetlService;
+
+ @Autowired
+ private MatService matService;
+
+ @Autowired
+ private LocCheckService locCheckService;
+
+ @RequestMapping(value = "/manlocDetl/orderNo")
+ @ManagerAuth
+ public R locNoList(@RequestParam String orderNo){
+
+ if (Cools.isEmpty(orderNo)){
+ return R.error("鏃犳暟鎹�");
+ }
+ List<LocCheck> list = locCheckService.selectList(new EntityWrapper<LocCheck>().eq("order_no", orderNo));
+ return R.ok(list);
+ }
@RequestMapping(value = "/manLocDetl/list/auth")
@ManagerAuth
@@ -76,7 +106,7 @@
@RequestMapping("/manLocDetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- manLocDetlService.adjustLocDetl(param, getUserId());
+ manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@@ -110,7 +140,67 @@
}
}
+ @RequestMapping(value = "/manlocDetl/statis/export")
+// @ManagerAuth
+ public void statisExport(HttpServletResponse response) throws IOException {
+ List<LocDetlWarningDTO> list = manLocDetlService.selectAllWarning();
+ for (LocDetlWarningDTO locDetl : list) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("搴撳瓨棰勮鏄庣粏", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), LocDetlWarningDTO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(list);
+ }
+// @RequestMapping(value = "/manlocDetl/updateStockFreeze/auth")
+// @ManagerAuth(memo = "搴撲綅鍐荤粨")
+// public R updateStockFreeze(ManLocDetl manLocDetl){
+// if (Cools.isEmpty(manLocDetl) || null==manLocDetl.getMatnr()){
+// return R.error();
+// }
+// manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze());
+// return R.ok();
+// }
+ @RequestMapping(value = "/manlocDetl/updateStockFreeze")
+ @ManagerAuth(memo = "搴撲綅鍐荤粨")
+ public R updateStockFreeze(@RequestParam String param){
+ List<ManLocDetl> list = JSONArray.parseArray(param, ManLocDetl.class);
+ if (Cools.isEmpty(list)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (ManLocDetl manLocDetl : list){
+ manLocDetl.setStockFreeze(0);
+ if (manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze()) != 1){
+ return R.error(manLocDetl.getMatnr()+"鍐荤粨澶辫触");
+ }
+ }
+ return R.ok("鍐荤粨鎴愬姛");
+ }
+
+ @RequestMapping(value = "/manlocDetl/updateStockDisFreeze")
+ @ManagerAuth(memo = "搴撲綅瑙ｅ喕")
+ public R updateStockDisFreeze(@RequestParam String param){
+ List<ManLocDetl> list = JSONArray.parseArray(param, ManLocDetl.class);
+ if (Cools.isEmpty(list)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (ManLocDetl manLocDetl : list){
+ manLocDetl.setStockFreeze(1);
+ if (manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze()) != 1){
+ return R.error(manLocDetl.getMatnr()+"瑙ｉ櫎鍐荤粨澶辫触");
+ }
+
+ }
+ return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
+ }
}
--
Gitblit v1.9.1