From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index 1405ead..250c640 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.service.AdjDetlService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.SaasLog;
+import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,9 @@
@Autowired
private AdjDetlService adjDetlService;
+
+ @Autowired
+ private SaasLogService saasLogService;
@RequestMapping(value = "/adjDetl/{id}/auth")
@ManagerAuth
@@ -41,12 +46,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+ //浠ュ墠鏄珛搴撳簱瀛樿皟鏁存帴鍙ｏ紝鍚庢敼涓哄钩搴撹皟鏁存帴鍙�
excludeTrash(param);
- EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- allLike(AdjDetl.class, param.keySet(), wrapper, condition);
+ wrapper.eq("type",2);
+ allLike(SaasLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1