From c9a3d872c8476060e5877f9fff107ac2ef39e307 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期一, 07 七月 2025 20:51:26 +0800
Subject: [PATCH] 生产管控模块 基本搭建2

---
 src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java                  |   82 +++++++++++
 src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml         |    5 
 src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java         |   14 ++
 src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java    |  161 +++++++++++++++++++++++
 src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java |   18 ++
 src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java           |    4 
 src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java                         |   46 ++++--
 src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java                     |    3 
 src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java            |   14 ++
 src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java                           |    4 
 src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java                   |    2 
 src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java           |   11 +
 src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java        |    2 
 src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java                |    2 
 src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java                |    2 
 15 files changed, 348 insertions(+), 22 deletions(-)

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 0689c51..92aa658 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
@@ -23,12 +23,12 @@
 /**
 * @Description: 涓婃枡
 * @Author: jeecg-boot
-* @Date:   2025-07-04
+* @Date:   2025-07-07
 * @Version: V1.0
 */
 @Api(tags="涓婃枡")
 @RestController
-@RequestMapping("/mesmaterialloading/mesMaterialLoading")
+@RequestMapping("/mes/mesMaterialLoading")
 @Slf4j
 public class MesMaterialLoadingController extends JeecgController<MesMaterialLoading, IMesMaterialLoadingService> {
    @Autowired
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
new file mode 100644
index 0000000..f6c7690
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
@@ -0,0 +1,161 @@
+package org.jeecg.modules.mes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+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.service.IMesMaterialTransferDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+* @Description: 鐗╂枡鎷夊姩鏄庣粏
+* @Author: jeecg-boot
+* @Date:   2025-07-07
+* @Version: V1.0
+*/
+@Api(tags="鐗╂枡鎷夊姩鏄庣粏")
+@RestController
+@RequestMapping("/mes/mesMaterialTransferDetail")
+@Slf4j
+public class MesMaterialTransferDetailController extends JeecgController<MesMaterialTransferDetail, IMesMaterialTransferDetailService> {
+   @Autowired
+   private IMesMaterialTransferDetailService mesMaterialTransferDetailService;
+
+   /**
+    * 鍒嗛〉鍒楄〃鏌ヨ
+    *
+    * @param mesMaterialTransferDetail
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   //@AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+   @GetMapping(value = "/list")
+   public Result<IPage<MesMaterialTransferDetail>> queryPageList(MesMaterialTransferDetail mesMaterialTransferDetail,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  HttpServletRequest req) {
+       QueryWrapper<MesMaterialTransferDetail> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferDetail, req.getParameterMap());
+       Page<MesMaterialTransferDetail> page = new Page<MesMaterialTransferDetail>(pageNo, pageSize);
+       IPage<MesMaterialTransferDetail> pageList = mesMaterialTransferDetailService.page(page, queryWrapper);
+       return Result.OK(pageList);
+   }
+
+   /**
+    *   娣诲姞
+    *
+    * @param mesMaterialTransferDetail
+    * @return
+    */
+   @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-娣诲姞")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-娣诲姞", notes="鐗╂枡鎷夊姩鏄庣粏-娣诲姞")
+   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:add")
+   @PostMapping(value = "/add")
+   public Result<String> add(@RequestBody MesMaterialTransferDetail mesMaterialTransferDetail) {
+       mesMaterialTransferDetailService.save(mesMaterialTransferDetail);
+       return Result.OK("娣诲姞鎴愬姛锛�");
+   }
+
+   /**
+    *  缂栬緫
+    *
+    * @param mesMaterialTransferDetail
+    * @return
+    */
+   @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-缂栬緫")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-缂栬緫", notes="鐗╂枡鎷夊姩鏄庣粏-缂栬緫")
+   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:edit")
+   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+   public Result<String> edit(@RequestBody MesMaterialTransferDetail mesMaterialTransferDetail) {
+       mesMaterialTransferDetailService.updateById(mesMaterialTransferDetail);
+       return Result.OK("缂栬緫鎴愬姛!");
+   }
+
+   /**
+    *   閫氳繃id鍒犻櫎
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎", notes="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎")
+   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:delete")
+   @DeleteMapping(value = "/delete")
+   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+       mesMaterialTransferDetailService.removeById(id);
+       return Result.OK("鍒犻櫎鎴愬姛!");
+   }
+
+   /**
+    *  鎵归噺鍒犻櫎
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎", notes="鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎")
+   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:deleteBatch")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.mesMaterialTransferDetailService.removeByIds(Arrays.asList(ids.split(",")));
+       return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+   }
+
+   /**
+    * 閫氳繃id鏌ヨ
+    *
+    * @param id
+    * @return
+    */
+   //@AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鏌ヨ")
+   @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鏌ヨ", notes="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鏌ヨ")
+   @GetMapping(value = "/queryById")
+   public Result<MesMaterialTransferDetail> queryById(@RequestParam(name="id",required=true) String id) {
+       MesMaterialTransferDetail mesMaterialTransferDetail = mesMaterialTransferDetailService.getById(id);
+       if(mesMaterialTransferDetail==null) {
+           return Result.error("鏈壘鍒板搴旀暟鎹�");
+       }
+       return Result.OK(mesMaterialTransferDetail);
+   }
+
+   /**
+   * 瀵煎嚭excel
+   *
+   * @param request
+   * @param mesMaterialTransferDetail
+   */
+   //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:exportXls")
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, MesMaterialTransferDetail mesMaterialTransferDetail) {
+       return super.exportXls(request, mesMaterialTransferDetail, MesMaterialTransferDetail.class, "鐗╂枡鎷夊姩鏄庣粏");
+   }
+
+   /**
+     * 閫氳繃excel瀵煎叆鏁版嵁
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   //@RequiresPermissions("mes_material_transfer_detail:importExcel")
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, MesMaterialTransferDetail.class);
+   }
+
+}
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 f383147..bc702fe 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
@@ -9,6 +9,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -43,6 +44,7 @@
     private Date createTime;
 	/**宸ュ崟ID*/
 	@Excel(name = "宸ュ崟ID", width = 15)
+    @Dict(dictTable = "mes_production_work_order", dicCode = "id", dicText = "work_order_code")
     @ApiModelProperty(value = "宸ュ崟ID")
     private String workOrderId;
 	/**鐗╂枡缂栧彿*/
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 cd53747..92ce261 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -10,6 +10,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -19,7 +20,7 @@
 /**
  * @Description: 涓婃枡
  * @Author: jeecg-boot
- * @Date:   2025-07-04
+ * @Date:   2025-07-07
  * @Version: V1.0
  */
 @Data
@@ -55,10 +56,23 @@
     @ApiModelProperty(value = "鍒犻櫎鏍囪")
     @TableLogic
     private Integer delFlag;
-	/**鐢宠鍗旾D*/
-	@Excel(name = "鐢宠鍗旾D", width = 15)
-    @ApiModelProperty(value = "鐢宠鍗旾D")
-    private String requestId;
+	/**宸ュ崟ID*/
+	@Excel(name = "宸ュ崟ID", width = 15)
+    @Dict(dictTable = "mes_production_work_order", dicCode = "id", dicText = "work_order_code")
+    @ApiModelProperty(value = "宸ュ崟ID")
+    private String workOrderId;
+	/**璁惧ID*/
+	@Excel(name = "璁惧ID", width = 15)
+    @ApiModelProperty(value = "璁惧ID")
+    private String equipmentId;
+	/**宸ュ簭缂栫爜*/
+	@Excel(name = "宸ュ簭缂栫爜", width = 15)
+    @ApiModelProperty(value = "宸ュ簭缂栫爜")
+    private String processCode;
+	/**宸ュ簭鍚嶇О*/
+	@Excel(name = "宸ュ簭鍚嶇О", width = 15)
+    @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+    private String processName;
 	/**鐗╂枡缂栫爜*/
 	@Excel(name = "鐗╂枡缂栫爜", width = 15)
     @ApiModelProperty(value = "鐗╂枡缂栫爜")
@@ -67,16 +81,16 @@
 	@Excel(name = "鐗╂枡鍚嶇О", width = 15)
     @ApiModelProperty(value = "鐗╂枡鍚嶇О")
     private String materialName;
-	/**鐞嗚鎷夊姩鏁伴噺*/
-	@Excel(name = "鐞嗚鎷夊姩鏁伴噺", width = 15)
-    @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
-    private Double specifiedQuantity;
-	/**瀹為檯鎷夊姩鏁伴噺*/
-	@Excel(name = "瀹為檯鎷夊姩鏁伴噺", width = 15)
-    @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
-    private Double actualQuantity;
-	/**杞﹂棿鍓╀綑鏁伴噺*/
-	@Excel(name = "杞﹂棿鍓╀綑鏁伴噺", width = 15)
-    @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
+	/**鎵规鍙�*/
+	@Excel(name = "鎵规鍙�", width = 15)
+    @ApiModelProperty(value = "鎵规鍙�")
+    private String batchNumber;
+	/**鏁伴噺*/
+	@Excel(name = "鏁伴噺", width = 15)
+    @ApiModelProperty(value = "鏁伴噺")
+    private Double quantity;
+	/**鍓╀綑鏁伴噺*/
+	@Excel(name = "鍓╀綑鏁伴噺", width = 15)
+    @ApiModelProperty(value = "鍓╀綑鏁伴噺")
     private Double remainingQuantity;
 }
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java
new file mode 100644
index 0000000..f913256
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java
@@ -0,0 +1,82 @@
+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.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 鐗╂枡鎷夊姩鏄庣粏
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("mes_material_transfer_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="mes_material_transfer_detail瀵硅薄", description="鐗╂枡鎷夊姩鏄庣粏")
+public class MesMaterialTransferDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**涓婚敭*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭")
+    private String id;
+	/**鍒涘缓浜�*/
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
+	/**鍒涘缓鏃ユ湡*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+    private Date createTime;
+	/**鏇存柊浜�*/
+    @ApiModelProperty(value = "鏇存柊浜�")
+    private String updateBy;
+	/**鏇存柊鏃ユ湡*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+    private Date updateTime;
+	/**鍒犻櫎鏍囪*/
+	@Excel(name = "鍒犻櫎鏍囪", width = 15)
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    @TableLogic
+    private Integer delFlag;
+	/**鐢宠鍗旾D*/
+	@Excel(name = "鐢宠鍗旾D", width = 15)
+    @ApiModelProperty(value = "鐢宠鍗旾D")
+    private String requestId;
+	/**鐗╂枡缂栫爜*/
+	@Excel(name = "鐗╂枡缂栫爜", width = 15)
+    @ApiModelProperty(value = "鐗╂枡缂栫爜")
+    private String materialNumber;
+	/**鐗╂枡鍚嶇О*/
+	@Excel(name = "鐗╂枡鍚嶇О", width = 15)
+    @ApiModelProperty(value = "鐗╂枡鍚嶇О")
+    private String materialName;
+	/**鐞嗚鎷夊姩鏁伴噺*/
+	@Excel(name = "鐞嗚鎷夊姩鏁伴噺", width = 15)
+    @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
+    private Double specifiedQuantity;
+	/**瀹為檯鎷夊姩鏁伴噺*/
+	@Excel(name = "瀹為檯鎷夊姩鏁伴噺", width = 15)
+    @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
+    private Double actualQuantity;
+	/**杞﹂棿鍓╀綑鏁伴噺*/
+	@Excel(name = "杞﹂棿鍓╀綑鏁伴噺", width = 15)
+    @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
+    private Double remainingQuantity;
+}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
index 2013fab..488323c 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
@@ -74,14 +74,17 @@
     private Double planQuantity;
 	/**浜х嚎ID(鍐椾綑)*/
 	@Excel(name = "浜х嚎ID(鍐椾綑)", width = 15)
+    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
     @ApiModelProperty(value = "浜х嚎ID(鍐椾綑)")
     private String factoryId;
 	/**鐝粍ID*/
 	@Excel(name = "鐝粍ID", width = 15)
+    @Dict(dictTable = "base_shift_group", dicCode = "id", dicText = "group_name")
     @ApiModelProperty(value = "鐝粍ID")
     private String groupId;
 	/**鐝ID(鍐椾綑)*/
 	@Excel(name = "鐝ID(鍐椾綑)", width = 15)
+    @Dict(dictTable = "base_shift", dicCode = "id", dicText = "shift_name")
     @ApiModelProperty(value = "鐝ID(鍐椾綑)")
     private String shiftId;
 	/**鎺掍骇鏃ユ湡*/
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 36fb341..b9e43ff 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -58,14 +58,17 @@
     private Integer delFlag;
 	/**璁㈠崟ID*/
 	@Excel(name = "璁㈠崟ID", width = 15)
+    @Dict(dictTable = "mes_production_order", dicCode = "id", dicText = "order_code")
     @ApiModelProperty(value = "璁㈠崟ID")
     private String orderId;
 	/**宸ュ崟ID*/
 	@Excel(name = "宸ュ崟ID", width = 15)
+    @Dict(dictTable = "mes_production_work_order", dicCode = "id", dicText = "work_order_code")
     @ApiModelProperty(value = "宸ュ崟ID")
     private String workOrderId;
 	/**浜х嚎ID*/
 	@Excel(name = "浜х嚎ID", width = 15)
+    @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
     @ApiModelProperty(value = "浜х嚎ID")
     private String factoryId;
 	/**鎵规鍙�*/
@@ -92,6 +95,7 @@
     private Date reportTime;
 	/**绾胯竟浠揑D*/
 	@Excel(name = "绾胯竟浠揑D", width = 15)
+    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
     @ApiModelProperty(value = "绾胯竟浠揑D")
     private String warehouseId;
 	/**鎴愬搧涓嬬嚎鎵撳嵃鐘舵��*/
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 a0596e9..57a9137 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java
@@ -6,7 +6,7 @@
 /**
  * @Description: 涓婃枡
  * @Author: jeecg-boot
- * @Date:   2025-07-04
+ * @Date:   2025-07-07
  * @Version: V1.0
  */
 public interface MesMaterialLoadingMapper extends BaseMapper<MesMaterialLoading> {
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java
new file mode 100644
index 0000000..b8e507a
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.mes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
+
+/**
+ * @Description: 鐗╂枡鎷夊姩鏄庣粏
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface MesMaterialTransferDetailMapper extends BaseMapper<MesMaterialTransferDetail> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml
new file mode 100644
index 0000000..e4afcfa
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml
@@ -0,0 +1,5 @@
+<?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.MesMaterialTransferDetailMapper">
+
+</mapper>
\ No newline at end of file
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 4bc9fd6..a96dd7d 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java
@@ -6,7 +6,7 @@
 /**
  * @Description: 涓婃枡
  * @Author: jeecg-boot
- * @Date:   2025-07-04
+ * @Date:   2025-07-07
  * @Version: V1.0
  */
 public interface IMesMaterialLoadingService extends IService<MesMaterialLoading> {
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java
new file mode 100644
index 0000000..6208670
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.mes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
+
+/**
+ * @Description: 鐗╂枡鎷夊姩鏄庣粏
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface IMesMaterialTransferDetailService extends IService<MesMaterialTransferDetail> {
+
+}
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 96cb028..1b0813e 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
@@ -9,7 +9,7 @@
 /**
  * @Description: 涓婃枡
  * @Author: jeecg-boot
- * @Date:   2025-07-04
+ * @Date:   2025-07-07
  * @Version: V1.0
  */
 @Service
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java
new file mode 100644
index 0000000..a4bf035
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.mes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
+import org.jeecg.modules.mes.mapper.MesMaterialTransferDetailMapper;
+import org.jeecg.modules.mes.service.IMesMaterialTransferDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 鐗╂枡鎷夊姩鏄庣粏
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Service
+public class MesMaterialTransferDetailServiceImpl extends ServiceImpl<MesMaterialTransferDetailMapper, MesMaterialTransferDetail> implements IMesMaterialTransferDetailService {
+
+}
diff --git a/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java b/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
index 54fbc48..2d51ada 100644
--- a/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
+++ b/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
@@ -79,6 +79,16 @@
     * @param pmsMaterialProcess
     * @return
     */
+   /**
+    *  缂栬緫
+    * 鏍规嵁ID鏇存柊鐗╂枡宸ュ簭淇℃伅
+    *
+    * @param pmsMaterialProcess 鐗╂枡宸ュ簭瀹炰綋瀵硅薄锛堝寘鍚渶瑕佹洿鏂扮殑ID鍜屼慨鏀瑰悗鐨勫瓧娈靛�硷級
+    *        - 蹇呴』鍖呭惈鏈夋晥鐨勭墿鏂欏伐搴廔D
+    *        - 浠呮洿鏂板疄浣撲腑闈炵┖鐨勫瓧娈�
+    * @return 杩斿洖缁熶竴鏍煎紡鐨勫搷搴旂粨鏋滐紝鍖呭惈鎿嶄綔鐘舵�佸拰鎻愮ず淇℃伅
+    * @apiNote 璇ユ搷浣滈渶瑕佸疄浣撲腑鍖呭惈鏈夋晥ID锛屾墽琛屽熀浜庝富閿殑瀛楁绾ф洿鏂�
+    */
    @AutoLog(value = "鐗╂枡宸ュ簭-缂栬緫")
    @ApiOperation(value="鐗╂枡宸ュ簭-缂栬緫", notes="鐗╂枡宸ュ簭-缂栬緫")
    //@RequiresPermissions("org.jeecg.modules:pms_material_process:edit")
@@ -87,7 +97,6 @@
        pmsMaterialProcessService.updateById(pmsMaterialProcess);
        return Result.OK("缂栬緫鎴愬姛!");
    }
-
    /**
     *   閫氳繃id鍒犻櫎
     *

--
Gitblit v1.9.3