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/system/controller/ResourceController.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 12ad261..b7d3d41 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -3,20 +3,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.system.entity.Resource;
-import com.zy.system.service.ResourceService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.core.controller.AbstractBaseController;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Resource;
+import com.zy.system.service.ResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
-public class ResourceController extends AbstractBaseController {
+public class ResourceController extends BaseController {
@Autowired
private ResourceService resourceService;
@@ -41,14 +41,32 @@
return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ @RequestMapping(value = "/resource/tree/auth")
+ @ManagerAuth
+ public R tree(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("sort");
+ }
+ return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -77,7 +95,7 @@
return R.ok();
}
- @RequestMapping(value = "/resource/update/auth")
+ @RequestMapping(value = "/resource/update/auth")
@ManagerAuth(memo = "鑿滃崟淇敼")
public R update(Resource resource){
if (Cools.isEmpty(resource) || null==resource.getId()){
@@ -87,13 +105,22 @@
return R.ok();
}
+// @RequestMapping(value = "/resource/delete/auth")
+// @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
+// public R delete(Integer[] ids){
+// if (Cools.isEmpty(ids)){
+// return R.error();
+// }
+// resourceService.deleteBatchIds(Arrays.asList(ids));
+// return R.ok();
+// }
+
@RequestMapping(value = "/resource/delete/auth")
- @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ resourceService.deleteById(id);
}
- resourceService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
--
Gitblit v1.9.1