From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
index f6c7690..28533aa 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
+import org.jeecg.modules.mes.entity.MesMaterialUnloading;
import org.jeecg.modules.mes.service.IMesMaterialTransferDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -157,5 +158,19 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesMaterialTransferDetail.class);
}
-
+ /*
+ * 鏍规嵁requestId鏌ヨ鏄庣粏
+ * @param requestId
+ * */
+ @RequestMapping("/queryTransferDetailBy")
+ public Result<IPage<MesMaterialTransferDetail>> queryUnloadingByLoadingId(MesMaterialTransferDetail mesMaterialTransferDetail, @RequestParam("requestId") String loadingId,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MesMaterialTransferDetail> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferDetail, req.getParameterMap());
+ queryWrapper.eq("request_id", loadingId);
+ Page<MesMaterialTransferDetail> page = new Page<MesMaterialTransferDetail>(pageNo, pageSize);
+ IPage<MesMaterialTransferDetail> pageList = mesMaterialTransferDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3