From 5d73eadd31ee11766818bbce0ff625a98a9ad9f2 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期四, 10 七月 2025 14:54:20 +0800
Subject: [PATCH] 生产管控模块 基本搭建3
---
src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java | 5
src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java | 4
src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java | 4
src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml | 13 ++
src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java | 6 +
src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java | 6 +
src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java | 9 +
src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java | 12 ++
src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml | 11 +
src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java | 6
src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java | 15 +
src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java | 11 +
src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml | 6
src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml | 22 +++
src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java | 5
src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java | 5
src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java | 15 +
src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java | 4
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java | 17 ++
src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java | 20 +++
src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java | 6 +
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java | 8
src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java | 11 +
src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java | 18 +++
src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java | 5
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java | 8 +
src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java | 6
src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java | 19 ++
src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java | 9 +
src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java | 7 +
src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml | 11 +
src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java | 4
32 files changed, 276 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java b/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
index ed5d68f..3ae72b7 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
@@ -157,5 +157,12 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesKittingCompletenessCheck.class);
}
-
+ /*
+ * 閫氳繃 workOrderId 鏌ヨ榻愬淇℃伅
+ * @param workOrderId
+ * */
+ @GetMapping("/queryCompletenessCheckByWorkOrderId")
+ public Result<?> queryCompletenessCheckByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
+ return Result.OK(mesKittingCompletenessCheckService.queryCompletenessCheckByWorkOrderId(workOrderId));
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
index 92aa658..24007bb 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
@@ -157,5 +157,25 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesMaterialLoading.class);
}
+ /**
+ * 閫氳繃loadingId鏌ヨ涓嬫枡淇℃伅
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping("/queryUnloadingByLoadingId")
+ public Result<?> queryUnloadingByLoadingId(HttpServletRequest request, HttpServletResponse response) {
+ String loadingId = request.getParameter("loadingId");
+ return Result.OK(mesMaterialLoadingService.queryUnloadingByLoadingId(loadingId));
+ }
+ /*
+ * 閫氳繃 workOrderId 鏌ヨ涓婃枡淇℃伅
+ * @param workOrderId
+ * */
+ @GetMapping("/queryLoadingByWorkOrderId")
+ public Result<?> queryLoadingByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
+ return Result.OK(mesMaterialLoadingService.queryLoadingByWorkOrderId(workOrderId));
+ }
}
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);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
index 202bf22..e7dc83f 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
@@ -157,5 +157,13 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesMaterialTransferRequest.class);
}
+ /*
+ * 閫氳繃workOrderId 鏌ヨmesMaterialTransferRequest鏁版嵁
+ *@param workOrderId
+ * */
+ @GetMapping(value = "/queryMaterialTransferRequestByWorkOrderId")
+ public Result<?> queryMaterialTransferRequestByWorkOrderId(@RequestParam(name="workOrderId",required=true) String workOrderId) {
+ return Result.OK(mesMaterialTransferRequestService.queryMaterialTransferRequestByWorkOrderId(workOrderId));
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java
index 006deb6..f7c95b9 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java
@@ -157,5 +157,16 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesMaterialUnloading.class);
}
+ @RequestMapping("/queryUnloadingByLoadingId")
+ public Result<IPage<MesMaterialUnloading>> queryUnloadingByLoadingId(MesMaterialUnloading mesMaterialUnloading, @RequestParam("loadingId") String loadingId,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MesMaterialUnloading> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialUnloading, req.getParameterMap());
+ queryWrapper.eq("loading_id", loadingId);
+ Page<MesMaterialUnloading> page = new Page<MesMaterialUnloading>(pageNo, pageSize);
+ IPage<MesMaterialUnloading> pageList = mesMaterialUnloadingService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java b/src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java
index 48386cd..488fc2f 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java
@@ -157,5 +157,12 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesTransferOrderPrint.class);
}
-
+ /**
+ * 鏍规嵁 orderId 鏌ヨ绉诲簱鍗�
+ * @param orderId
+ */
+ @GetMapping("/queryOrderPrintByOrderId")
+ public Result<?> queryOrderPrintByOrderId(@RequestParam(name = "orderId",required = true) String orderId){
+ return Result.ok(mesTransferOrderPrintService.queryOrderPrintByOrderId(orderId));
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
index a55d476..a3634d0 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 宸ュ崟鎶ュ伐
@@ -157,5 +158,22 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesWorkReporting.class);
}
+ /**
+ * 鏍规嵁workOrderId鏌ヨ 鎶ュ伐
+ *
+ * @param workOrderId
+ * @return
+ *
+ */
+ @GetMapping(value = "/queryWorkReportingByWorkOrderId")
+ public Result<?> queryWorkReportingByWorkOrderId(@RequestParam("workOrderId") String workOrderId){
+ List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByWorkOrderId(workOrderId);
+ return Result.OK(mesWorkReportings);
+ }
+ @GetMapping(value = "/queryWorkReportingByOrderId")
+ public Result<?> queryWorkReportingByOrderId(@RequestParam("orderId") String orderId){
+ List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByOrderId(orderId);
+ return Result.OK(mesWorkReportings);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
index bc702fe..1e9224f 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -67,4 +68,7 @@
@Excel(name = "鏄惁榻愬", width = 15)
@ApiModelProperty(value = "鏄惁榻愬")
private String checkFlag;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
index 92ce261..94e5eeb 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -93,4 +90,7 @@
@Excel(name = "鍓╀綑鏁伴噺", width = 15)
@ApiModelProperty(value = "鍓╀綑鏁伴噺")
private Double remainingQuantity;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
index cf9c7a3..09e3660 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -103,4 +100,14 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏈�鏅氶厤閫佹椂闂�")
private Date latestDeliveryTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐩爣搴撳瓨鍦�")
+ private String targetWarehouseName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍘熷簱瀛樺湴")
+ private String originalWarehouseName;
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java b/src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java
index 1622cef..7363eec 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -100,4 +97,14 @@
@Dict(dicCode = "order_status")
@ApiModelProperty(value = "绉诲簱鍗曠姸鎬�")
private String orderStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+ private String orderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐩爣搴撳瓨鍦�")
+ private String targetWarehouseName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍘熷簱瀛樺湴")
+ private String originalWarehouseName;
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
index b9e43ff..d95a708 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -103,4 +100,18 @@
@Dict(dicCode = "print_status")
@ApiModelProperty(value = "鎴愬搧涓嬬嚎鎵撳嵃鐘舵��")
private String printStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟鐢熶骇鍙�")
+ private String orderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浜х嚎鍚嶇О")
+ private String factoryName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
+
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java
index 9871a8a..e6516c2 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;
+
+import java.util.List;
/**
* @Description: 榻愬鎬ф鏌ヨ褰�
@@ -10,5 +13,5 @@
* @Version: V1.0
*/
public interface MesKittingCompletenessCheckMapper extends BaseMapper<MesKittingCompletenessCheck> {
-
+ List<MesKittingCompletenessCheck> queryCompletenessCheckByWorkOrderId(@Param("workOrderId") String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java
index 57a9137..01398bd 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
+import org.jeecg.modules.mes.entity.MesMaterialUnloading;
+
+import java.util.List;
/**
* @Description: 涓婃枡
@@ -10,5 +14,6 @@
* @Version: V1.0
*/
public interface MesMaterialLoadingMapper extends BaseMapper<MesMaterialLoading> {
-
+ List<MesMaterialUnloading> queryUnloadingByLoadingId(@Param("loadingId") String loadingId);
+ List<MesMaterialLoading> queryLoadingByWorkOrderId(@Param("workOrderId") String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java
index 28b0112..36d19c6 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesMaterialTransferRequest;
+
+import java.util.List;
/**
* @Description: 鐗╂枡鎷夊姩鐢宠
@@ -10,5 +13,5 @@
* @Version: V1.0
*/
public interface MesMaterialTransferRequestMapper extends BaseMapper<MesMaterialTransferRequest> {
-
+ List<MesMaterialTransferRequest> queryMaterialTransferRequestByWorkOrderId(@Param("workOrderId") String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java
index f3f26d4..2513979 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesTransferOrderPrint;
+
+import java.util.List;
/**
* @Description: 绉诲簱鍗曟墦鍗�
@@ -10,5 +13,5 @@
* @Version: V1.0
*/
public interface MesTransferOrderPrintMapper extends BaseMapper<MesTransferOrderPrint> {
-
+ List<MesTransferOrderPrint> queryOrderPrintByOrderId(@Param("orderId") String orderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java
index fc7c134..9c5d355 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesWorkReporting;
+
+import java.util.List;
/**
* @Description: 宸ュ崟鎶ュ伐
@@ -10,5 +13,6 @@
* @Version: V1.0
*/
public interface MesWorkReportingMapper extends BaseMapper<MesWorkReporting> {
-
+ List<MesWorkReporting> queryWorkReportingByWorkOrderId(@Param("workOrderId") String workOrderId);
+ List<MesWorkReporting> queryWorkReportingByOrderId(@Param("orderId") String orderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
index ba0e018..0d15f25 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesKittingCompletenessCheckMapper">
-
+ <select id="queryCompletenessCheckByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesKittingCompletenessCheck">
+ select mkcc.*,mpwo.work_order_code as workOrderCode from mes_kitting_completeness_check mkcc
+ left join mes_production_work_order mpwo on mkcc.work_order_id = mpwo.id
+ where mkcc.work_order_id = #{workOrderId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
index 52eb013..d7018e6 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesMaterialLoadingMapper">
-
+ <select id="queryUnloadingByLoadingId" resultType="org.jeecg.modules.mes.entity.MesMaterialUnloading">
+ select * from mes_material_unloading where loading_id = #{loadingId} and del_flag = 0
+ </select>
+ <select id="queryLoadingByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
+ select mml.* ,mpwo.work_order_code as workOrderCode
+ from mes_material_loading mml
+ left join mes_production_work_order mpwo on mml.work_order_id = mpwo.id
+ where mml.work_order_id = #{workOrderId}
+ and mml.del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml
index 2d96403..d9a7749 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesMaterialTransferRequestMapper">
+ <select id="queryMaterialTransferRequestByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesMaterialTransferRequest">
+ select mmtr.*,
+ mpwo.work_order_code as workOrderCode,
+ blsw_original.warehouse_name as originalWarehouseName,
+ blsw_target.warehouse_name as targetWarehouseName
+ from mes_material_transfer_request mmtr
+ left join mes_production_work_order mpwo on mmtr.work_order_id = mpwo.id
+ left join base_line_side_warehouse blsw_original on mmtr.original_warehouse_id = blsw_original.id
+ left join base_line_side_warehouse blsw_target on mmtr.target_warehouse_id = blsw_target.id
+ where mmtr.work_order_id = #{workOrderId} and mmtr.del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml
index d3c2ab6..a93203d 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesTransferOrderPrintMapper">
-
+ <select id="queryOrderPrintByOrderId" resultType="org.jeecg.modules.mes.entity.MesTransferOrderPrint">
+ select mtop.*,
+ mpwo.order_code as orderCode,
+ blsw_original.warehouse_name as originalWarehouseName,
+ blsw_target.warehouse_name as targetWarehouseName
+ from mes_transfer_order_print mtop
+ left join mes_production_order mpwo on mtop.order_id = mpwo.id
+ left join base_line_side_warehouse blsw_original on mtop.original_warehouse_id = blsw_original.id
+ left join base_line_side_warehouse blsw_target on mtop.target_warehouse_id = blsw_target.id
+ where mtop.order_id = #{orderId}
+ and mtop.del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml
index 603f92a..8e27135 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml
@@ -1,5 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesWorkReportingMapper">
+ <select id="queryWorkReportingByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesWorkReporting">
+ select mwr.*,mpo.order_code as orderCode,mpwo.work_order_code as workOrderCode,
+ bf.factory_name as factoryName , blsw.warehouse_name as warehouseName
+ from mes_work_reporting mwr
+ left join mes_production_order mpo on mwr.order_id = mpo.id
+ left join mes_production_work_order mpwo on mwr.work_order_id = mpwo.id
+ left join base_factory bf on mwr.factory_id = bf.id
+ left join base_line_side_warehouse blsw on mwr.warehouse_id = blsw.id
+ where mwr.work_order_id = #{workOrderId}
+ and mwr.del_flag = 0
+ </select>
+ <select id="queryWorkReportingByOrderId" resultType="org.jeecg.modules.mes.entity.MesWorkReporting">
+ select mwr.*,mpo.order_code as orderCode,mpwo.work_order_code as workOrderCode,
+ bf.factory_name as factoryName , blsw.warehouse_name as warehouseName
+ from mes_work_reporting mwr
+ left join mes_production_order mpo on mwr.order_id = mpo.id
+ left join mes_production_work_order mpwo on mwr.work_order_id = mpwo.id
+ left join base_factory bf on mwr.factory_id = bf.id
+ left join base_line_side_warehouse blsw on mwr.warehouse_id = blsw.id
+ where mwr.order_id = #{orderId}
+ and mwr.del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java b/src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java
index f522458..3df31ef 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;
+import java.util.List;
+
/**
* @Description: 榻愬鎬ф鏌ヨ褰�
* @Author: jeecg-boot
@@ -10,5 +12,5 @@
* @Version: V1.0
*/
public interface IMesKittingCompletenessCheckService extends IService<MesKittingCompletenessCheck> {
-
+ List<MesKittingCompletenessCheck> queryCompletenessCheckByWorkOrderId(String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java
index a96dd7d..10ffc3a 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
+import org.jeecg.modules.mes.entity.MesMaterialUnloading;
+
+import java.util.List;
/**
* @Description: 涓婃枡
@@ -10,5 +13,6 @@
* @Version: V1.0
*/
public interface IMesMaterialLoadingService extends IService<MesMaterialLoading> {
-
+ List<MesMaterialUnloading> queryUnloadingByLoadingId(String loadingId);
+ List<MesMaterialLoading> queryLoadingByWorkOrderId(String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java
index aa6981f..d84cc33 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesMaterialTransferRequest;
+import java.util.List;
+
/**
* @Description: 鐗╂枡鎷夊姩鐢宠
* @Author: jeecg-boot
@@ -10,5 +12,5 @@
* @Version: V1.0
*/
public interface IMesMaterialTransferRequestService extends IService<MesMaterialTransferRequest> {
-
+ List<MesMaterialTransferRequest> queryMaterialTransferRequestByWorkOrderId(String workOrderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java b/src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java
index f3ba981..bc9acdd 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesTransferOrderPrint;
+import java.util.List;
+
/**
* @Description: 绉诲簱鍗曟墦鍗�
* @Author: jeecg-boot
@@ -10,5 +12,5 @@
* @Version: V1.0
*/
public interface IMesTransferOrderPrintService extends IService<MesTransferOrderPrint> {
-
+ List<MesTransferOrderPrint> queryOrderPrintByOrderId(String orderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java b/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
index af7cc89..adc9c0d 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesWorkReporting;
+import java.util.List;
+
/**
* @Description: 宸ュ崟鎶ュ伐
* @Author: jeecg-boot
@@ -10,5 +12,6 @@
* @Version: V1.0
*/
public interface IMesWorkReportingService extends IService<MesWorkReporting> {
-
+ List<MesWorkReporting> queryWorkReportingByWorkOrderId(String workOrderId);
+ List<MesWorkReporting> queryWorkReportingByOrderId(String orderId);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
index 2217dd9..0fa7e96 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java
@@ -6,6 +6,8 @@
import org.jeecg.modules.mes.service.IMesKittingCompletenessCheckService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @Description: 榻愬鎬ф鏌ヨ褰�
* @Author: jeecg-boot
@@ -15,4 +17,8 @@
@Service
public class MesKittingCompletenessCheckServiceImpl extends ServiceImpl<MesKittingCompletenessCheckMapper, MesKittingCompletenessCheck> implements IMesKittingCompletenessCheckService {
+ @Override
+ public List<MesKittingCompletenessCheck> queryCompletenessCheckByWorkOrderId(String workOrderId) {
+ return baseMapper.queryCompletenessCheckByWorkOrderId(workOrderId);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java
index 1b0813e..55d26ce 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
+import org.jeecg.modules.mes.entity.MesMaterialUnloading;
import org.jeecg.modules.mes.mapper.MesMaterialLoadingMapper;
import org.jeecg.modules.mes.service.IMesMaterialLoadingService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @Description: 涓婃枡
@@ -15,4 +18,13 @@
@Service
public class MesMaterialLoadingServiceImpl extends ServiceImpl<MesMaterialLoadingMapper, MesMaterialLoading> implements IMesMaterialLoadingService {
+ @Override
+ public List<MesMaterialUnloading> queryUnloadingByLoadingId(String loadingId) {
+ return baseMapper.queryUnloadingByLoadingId(loadingId);
+ }
+
+ @Override
+ public List<MesMaterialLoading> queryLoadingByWorkOrderId(String workOrderId) {
+ return baseMapper.queryLoadingByWorkOrderId(workOrderId);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java
index 18bdf44..fb4b473 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java
@@ -6,6 +6,8 @@
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @Description: 鐗╂枡鎷夊姩鐢宠
* @Author: jeecg-boot
@@ -15,4 +17,8 @@
@Service
public class MesMaterialTransferRequestServiceImpl extends ServiceImpl<MesMaterialTransferRequestMapper, MesMaterialTransferRequest> implements IMesMaterialTransferRequestService {
+ @Override
+ public List<MesMaterialTransferRequest> queryMaterialTransferRequestByWorkOrderId(String workOrderId) {
+ return baseMapper.queryMaterialTransferRequestByWorkOrderId(workOrderId);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java
index 27d718e..939729b 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java
@@ -6,6 +6,8 @@
import org.jeecg.modules.mes.service.IMesTransferOrderPrintService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @Description: 绉诲簱鍗曟墦鍗�
* @Author: jeecg-boot
@@ -15,4 +17,8 @@
@Service
public class MesTransferOrderPrintServiceImpl extends ServiceImpl<MesTransferOrderPrintMapper, MesTransferOrderPrint> implements IMesTransferOrderPrintService {
+ @Override
+ public List<MesTransferOrderPrint> queryOrderPrintByOrderId(String orderId) {
+ return baseMapper.queryOrderPrintByOrderId(orderId);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
index a20f621..9021437 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
@@ -6,6 +6,8 @@
import org.jeecg.modules.mes.service.IMesWorkReportingService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @Description: 宸ュ崟鎶ュ伐
* @Author: jeecg-boot
@@ -15,4 +17,13 @@
@Service
public class MesWorkReportingServiceImpl extends ServiceImpl<MesWorkReportingMapper, MesWorkReporting> implements IMesWorkReportingService {
+ @Override
+ public List<MesWorkReporting> queryWorkReportingByWorkOrderId(String workOrderId) {
+ return baseMapper.queryWorkReportingByWorkOrderId(workOrderId);
+ }
+
+ @Override
+ public List<MesWorkReporting> queryWorkReportingByOrderId(String orderId) {
+ return baseMapper.queryWorkReportingByOrderId(orderId);
+ }
}
--
Gitblit v1.9.3