新火炬后端单体项目初始化代码
houshuai
2025-07-10 5d73eadd31ee11766818bbce0ff625a98a9ad9f2
生产管控模块 基本搭建3
已修改32个文件
308 ■■■■ 文件已修改
src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesMaterialUnloadingController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesTransferOrderPrintController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/entity/MesTransferOrderPrint.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferRequestMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/MesTransferOrderPrintMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/MesWorkReportingMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferRequestMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/xml/MesTransferOrderPrintMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/mapper/xml/MesWorkReportingMapper.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferRequestService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/IMesTransferOrderPrintService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferRequestServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/impl/MesTransferOrderPrintServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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));
    }
}
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));
    }
}
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);
    }
}
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));
    }
}
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);
    }
}
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));
    }
}
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);
    }
}
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;
}
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;
}
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;
}
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;
}
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;
}
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);
}
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);
}
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);
}
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);
}
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);
}
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>
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>
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>
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>
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>
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);
}
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);
}
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);
}
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);
}
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);
}
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);
    }
}
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);
    }
}
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);
    }
}
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);
    }
}
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);
    }
}