From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
index ab47108..d327bc4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -9,19 +9,17 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.MatField;
-import com.zy.asrs.wms.asrs.entity.MatFieldValue;
-import com.zy.asrs.wms.asrs.entity.Tag;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.template.MatTemplate;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatFieldValueService;
import com.zy.asrs.wms.asrs.service.TagService;
+import com.zy.asrs.wms.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.Mat;
import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
@@ -33,6 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/api")
@@ -46,6 +45,8 @@
private MatFieldValueService matFieldValueService;
@Autowired
private TagService tagService;
+ @Autowired
+ private LocDetlServiceImpl locDetlService;
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/page")
@@ -70,6 +71,44 @@
return R.ok().add(data);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/3
+ * @description: 鑾峰彇鍙嚭搴撶墿鏂欎俊鎭�
+ * @version 1.0
+ */
+ @PreAuthorize("hasAuthority('asrs:mat:list')")
+ @PostMapping("/locs/mats/page")
+ public R getOutPage(@RequestBody Map<String, Object> param) {
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().select(LocDetl::getMatId));
+ if (locDetls.isEmpty()) {
+ return R.ok();
+ }
+ /**鑾峰彇瀛樼墿鏂欎俊鎭�*/
+ Set<Long> ids = locDetls.stream().map(LocDetl::getMatId).collect(Collectors.toSet());
+
+ BaseParam baseParam = buildParam(param, BaseParam.class);
+ PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class);
+ QueryWrapper<Mat> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.orderByDesc("utiliz");
+ queryWrapper.in("id", ids);
+
+ PageParam<Mat, BaseParam> page = matService.page(pageParam, queryWrapper);
+
+ JSONObject data = JSON.parseObject(JSON.toJSONString(page));
+
+ List<Mat> records = page.getRecords();
+ data.put("records", records);
+ for (Mat mat : records) {
+ List<MatFieldValue> list = matFieldValueService.list(new LambdaQueryWrapper<MatFieldValue>()
+ .eq(MatFieldValue::getMatId, mat.getId()));
+ mat.syncField(list);
+ }
+ return R.ok(data);
+ }
+
+
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/list")
@CacheData(tableName = {"man_mat"})
--
Gitblit v1.9.1