feat(wms): 复制mes的生产订单信息模块

- 新增生产订单信息相关的实体类、BO、VO、Mapper、Service、Controller等
- 实现生产订单信息的增删查改功能
- 添加生产订单信息的导出功能
-优化生产订单信息的查询条件和结果展示

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/ProdOrderInfoController.java

@@ -0,0 +1,117 @@
+package org.dromara.wms.controller;
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.wms.domain.bo.ProdOrderInfoBo;
+import org.dromara.wms.domain.vo.ProdOrderInfoVo;
+import org.dromara.wms.service.IProdOrderInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 生产订单信息
+ * 前端访问路由地址为:/mes/orderInfo
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/orderInfo")
+public class ProdOrderInfoController extends BaseController {
+
+    private final IProdOrderInfoService prodOrderInfoService;
+
+    /**
+     * 查询生产订单信息列表
+     */
+    //@SaCheckPermission("mes:orderInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdOrderInfoVo> list(ProdOrderInfoBo bo, PageQuery pageQuery) {
+        return prodOrderInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出生产订单信息列表
+     */
+    //@SaCheckPermission("mes:orderInfo:export")
+    @Log(title = "生产订单信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdOrderInfoBo bo, HttpServletResponse response) {
+        List<ProdOrderInfoVo> list = prodOrderInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "生产订单信息", ProdOrderInfoVo.class, response);
+    }
+
+    /**
+     * 获取生产订单信息详细信息
+     *
+     * @param productOrderId 主键
+     */
+    //@SaCheckPermission("mes:orderInfo:query")
+    @GetMapping("/{productOrderId}")
+    public R<ProdOrderInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long productOrderId) {
+        return R.ok(prodOrderInfoService.queryById(productOrderId));
+    }
+
+    /**
+     * 新增生产订单信息
+     */
+    //@SaCheckPermission("mes:orderInfo:add")
+    @Log(title = "生产订单信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdOrderInfoBo bo) {
+        return toAjax(prodOrderInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改生产订单信息
+     */
+    //@SaCheckPermission("mes:orderInfo:edit")
+    @Log(title = "生产订单信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdOrderInfoBo bo) {
+        return toAjax(prodOrderInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除生产订单信息
+     *
+     * @param productOrderIds 主键串
+     */
+    //@SaCheckPermission("mes:orderInfo:remove")
+    @Log(title = "生产订单信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{productOrderIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] productOrderIds) {
+        return toAjax(prodOrderInfoService.deleteWithValidByIds(List.of(productOrderIds), true));
+    }
+
+
+    /**
+     * 下拉框查询生产订单信息列表
+     */
+
+    @GetMapping("getProdOrderInfoList")
+    public R<List<ProdOrderInfoVo>> getProdOrderInfolist(ProdOrderInfoBo bo) {
+        List<ProdOrderInfoVo> list = prodOrderInfoService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/ProdOrderInfo.java

@@ -0,0 +1,193 @@
+package org.dromara.wms.domain;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 生产订单信息对象 prod_order_info
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prod_order_info")
+public class ProdOrderInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "product_order_id", type = IdType.AUTO)
+    private Long productOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 销售订单ID
+     */
+    private Long saleOrderId;
+
+    /**
+     * 项目编号
+     */
+    private String projectNo;
+
+    /**
+     * 订单类型（1外部销售 2对内生产)
+     */
+    private String orderType;
+
+    /**
+     * 物料ID
+     */
+    private Long materialId;
+
+    /**
+     * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+     */
+    private Long materialBomId;
+
+    /**
+     * 派工类型(1产线 2工艺路线 3工序)
+     */
+    private String dispatchType;
+
+    /**
+     * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+     */
+    private Long dispatchId;
+
+    /**
+     * 销售数量;销售订单的销售数量，如果无订单则需要输入
+     */
+    private Long saleAmount;
+
+    /**
+     * 计划交货日期
+     */
+    private Date planDeliveryDate;
+
+    /**
+     * 计划数量
+     */
+    private Long planAmount;
+
+    /**
+     * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+     */
+    private Long dispatchAmount;
+
+    /**
+     * 完成数量
+     */
+    private Long completeAmount;
+
+    /**
+     * 发布时间
+     */
+    private Date releaseTime;
+
+    /**
+     * 计划开始时间
+     */
+    private Date planBeginTime;
+
+    /**
+     * 计划结束时间
+     */
+    private Date planEndTime;
+
+    /**
+     * 开始时间
+     */
+    private Date realBeginTime;
+
+    /**
+     * 完成时间
+     */
+    private Date realEndTime;
+
+    /**
+     * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+     */
+    private String orderStatus;
+
+    /**
+     * 库存锁定标识（1是 0否）
+     */
+    private String stockLockFlag;
+
+    /**
+     * 前置生产订单ID
+     */
+    private Long preOrderId;
+
+    /**
+     * 前置订单编号
+     */
+    private String preOrderCode;
+
+    /**
+     * 完成标识（0正常 1降级 2超额）
+     */
+    private String finishFlag;
+
+    /**
+     * 是否已下达工单（1是 0否）
+     */
+    private String releaseFlag;
+
+    /**
+     * 订单版本
+     */
+    private String orderVersion;
+
+    /**
+     * 工厂ID
+     */
+    private Long factoryId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 物料编码
+     */
+    @TableField(exist = false)
+    private String materialCode;//映射字段
+
+    /**
+     * 物料名称
+     */
+    @TableField(exist = false)
+    private String materialName;//映射字段
+
+    /**
+     *
+     */
+    @TableField(exist = false)
+    private String dispatchName;//映射字段
+
+    /**
+     * 工艺路线名称
+     */
+    @TableField(exist = false)
+    private String routeName;//映射字段
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/ProdOrderInfoBo.java

@@ -0,0 +1,173 @@
+package org.dromara.wms.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.wms.domain.ProdOrderInfo;
+
+import java.util.Date;
+
+/**
+ * 生产订单信息业务对象 prod_order_info
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProdOrderInfo.class, reverseConvertGenerate = false)
+public class ProdOrderInfoBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long productOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 销售订单ID
+     */
+    private Long saleOrderId;
+
+    /**
+     * 项目编号
+     */
+    private String projectNo;
+
+    /**
+     * 订单类型（1外部销售 2对内生产)
+     */
+    private String orderType;
+
+    /**
+     * 物料ID
+     */
+    @NotNull(message = "物料ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long materialId;
+
+    /**
+     * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+     */
+//    @NotNull(message = "物料BOM_ID;默认选择最新的正常状态的bom，可修改不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long materialBomId;
+
+    /**
+     * 派工类型(1产线 2工艺路线 3工序)
+     */
+    @NotBlank(message = "派工类型(1产线 2工艺路线 3工序)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String dispatchType;
+
+    /**
+     * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+     */
+//    @NotNull(message = "派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long dispatchId;
+
+    /**
+     * 销售数量;销售订单的销售数量，如果无订单则需要输入
+     */
+//    @NotNull(message = "销售数量;销售订单的销售数量，如果无订单则需要输入不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long saleAmount;
+
+    /**
+     * 计划交货日期
+     */
+    private Date planDeliveryDate;
+
+    /**
+     * 计划数量
+     */
+    @NotNull(message = "计划数量不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long planAmount;
+
+    /**
+     * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+     */
+    private Long dispatchAmount;
+
+    /**
+     * 完成数量
+     */
+    private Long completeAmount;
+
+    /**
+     * 发布时间
+     */
+    private Date releaseTime;
+
+    /**
+     * 计划开始时间
+     */
+    private Date planBeginTime;
+
+    /**
+     * 计划结束时间
+     */
+    private Date planEndTime;
+
+    /**
+     * 开始时间
+     */
+    private Date realBeginTime;
+
+    /**
+     * 完成时间
+     */
+    private Date realEndTime;
+
+    /**
+     * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+     */
+    private String orderStatus;
+
+    /**
+     * 库存锁定标识（1是 0否）
+     */
+    private String stockLockFlag;
+
+    /**
+     * 前置生产订单ID
+     */
+    private Long preOrderId;
+
+    /**
+     * 前置订单编号
+     */
+    private String preOrderCode;
+
+    /**
+     * 完成标识（0正常 1降级 2超额）
+     */
+    private String finishFlag;
+
+    /**
+     * 是否已下达工单（1是 0否）
+     */
+    private String releaseFlag;
+
+    /**
+     * 订单版本
+     */
+    private String orderVersion;
+
+    /**
+     * 工厂ID
+     */
+    private Long factoryId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/ProdOrderInfoVo.java

@@ -0,0 +1,263 @@
+package org.dromara.wms.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.wms.domain.ProdOrderInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 生产订单信息视图对象 prod_order_info
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdOrderInfo.class)
+public class ProdOrderInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long productOrderId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+
+    /**
+     * 订单编号
+     */
+    @ExcelProperty(value = "订单编号")
+    private String orderCode;
+
+    /**
+     * 销售订单ID
+     */
+    @ExcelProperty(value = "销售订单ID")
+    private Long saleOrderId;
+
+    /**
+     * 项目编号
+     */
+    @ExcelProperty(value = "项目编号")
+    private String projectNo;
+
+    /**
+     * 订单类型（1外部销售 2对内生产)
+     */
+    @ExcelProperty(value = "订单类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_order_type")
+    private String orderType;
+
+    /**
+     * 物料ID
+     */
+    @ExcelProperty(value = "物料ID")
+    private Long materialId;
+
+    /**
+     * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+     */
+    @ExcelProperty(value = "物料BOM_ID;默认选择最新的正常状态的bom，可修改")
+    private Long materialBomId;
+
+    /**
+     * 派工类型(1产线 2工艺路线 3工序)
+     */
+    @ExcelProperty(value = "派工类型(1产线 2工艺路线 3工序)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_dispatch_type")
+    private String dispatchType;
+
+    /**
+     * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+     */
+    @ExcelProperty(value = "派工ID;", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "派=工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键")
+    private Long dispatchId;
+
+    /**
+     * 销售数量;销售订单的销售数量，如果无订单则需要输入
+     */
+    @ExcelProperty(value = "销售数量;销售订单的销售数量，如果无订单则需要输入")
+    private Long saleAmount;
+
+    /**
+     * 计划交货日期
+     */
+    @ExcelProperty(value = "计划交货日期")
+    private Date planDeliveryDate;
+
+    /**
+     * 计划数量
+     */
+    @ExcelProperty(value = "计划数量")
+    private Long planAmount;
+
+    /**
+     * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+     */
+    @ExcelProperty(value = "已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的")
+    private Long dispatchAmount;
+
+    /**
+     * 完成数量
+     */
+    @ExcelProperty(value = "完成数量")
+    private Long completeAmount;
+
+    /**
+     * 发布时间
+     */
+    @ExcelProperty(value = "发布时间")
+    private Date releaseTime;
+
+    /**
+     * 计划开始时间
+     */
+    @ExcelProperty(value = "计划开始时间")
+    private Date planBeginTime;
+
+    /**
+     * 计划结束时间
+     */
+    @ExcelProperty(value = "计划结束时间")
+    private Date planEndTime;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date realBeginTime;
+
+    /**
+     * 完成时间
+     */
+    @ExcelProperty(value = "完成时间")
+    private Date realEndTime;
+
+    /**
+     * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+     */
+    @ExcelProperty(value = "订单状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_order_status")
+    private String orderStatus;
+
+    /**
+     * 库存锁定标识（1是 0否）
+     */
+    @ExcelProperty(value = "库存锁定标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_stock_lock_flag")
+    private String stockLockFlag;
+
+    /**
+     * 前置生产订单ID
+     */
+    @ExcelProperty(value = "前置生产订单ID")
+    private Long preOrderId;
+
+    /**
+     * 前置订单编号
+     */
+    @ExcelProperty(value = "前置订单编号")
+    private String preOrderCode;
+
+    /**
+     * 完成标识（0正常 1降级 2超额）
+     */
+    @ExcelProperty(value = "完成标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_finish_flag")
+    private String finishFlag;
+
+    /**
+     * 是否已下达工单（1是 0否）
+     */
+    @ExcelProperty(value = "是否已下达工单", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_release_flag")
+    private String releaseFlag;
+
+    /**
+     * 订单版本
+     */
+    @ExcelProperty(value = "订单版本")
+    private String orderVersion;
+
+    /**
+     * 工厂ID
+     */
+    @ExcelProperty(value = "工厂ID")
+    private Long factoryId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 物料名称
+     */
+    @ExcelProperty(value = "物料名称")
+    private String materialName;//映射字段
+
+    /**
+     * 物料编码
+     */
+    @ExcelProperty(value = "物料编码")
+    private String materialCode;//映射字段
+
+
+    /**
+     * 工艺路线名称
+     */
+    @ExcelProperty(value = "工艺路线名称")
+    private String dispatchName;//映射字段
+
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/ProdOrderInfoMapper.java

@@ -0,0 +1,29 @@
+package org.dromara.wms.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.wms.domain.ProdOrderInfo;
+import org.dromara.wms.domain.vo.ProdOrderInfoVo;
+
+/**
+ * 生产订单信息Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+public interface ProdOrderInfoMapper extends BaseMapperPlus<ProdOrderInfo, ProdOrderInfoVo> {
+
+    /**
+     * 查询生产订单信息;生产工单列表
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    public Page<ProdOrderInfoVo> selectProdOrderInfoList(@Param("page") Page<ProdOrderInfoVo> page, @Param(Constants.WRAPPER) Wrapper<ProdOrderInfo> queryWrapper);
+
+
+
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IProdOrderInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.wms.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.wms.domain.bo.ProdOrderInfoBo;
+import org.dromara.wms.domain.vo.ProdOrderInfoVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 生产订单信息Service接口
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+public interface IProdOrderInfoService {
+
+    /**
+     * 查询生产订单信息
+     *
+     * @param productOrderId 主键
+     * @return 生产订单信息
+     */
+    ProdOrderInfoVo queryById(Long productOrderId);
+
+    /**
+     * 分页查询生产订单信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 生产订单信息分页列表
+     */
+    TableDataInfo<ProdOrderInfoVo> queryPageList(ProdOrderInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的生产订单信息列表
+     *
+     * @param bo 查询条件
+     * @return 生产订单信息列表
+     */
+    List<ProdOrderInfoVo> queryList(ProdOrderInfoBo bo);
+
+    /**
+     * 新增生产订单信息
+     *
+     * @param bo 生产订单信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProdOrderInfoBo bo);
+
+    /**
+     * 修改生产订单信息
+     *
+     * @param bo 生产订单信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProdOrderInfoBo bo);
+
+    /**
+     * 校验并批量删除生产订单信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/ProdOrderInfoServiceImpl.java

@@ -0,0 +1,196 @@
+package org.dromara.wms.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.wms.domain.ProdOrderInfo;
+import org.dromara.wms.domain.bo.ProdOrderInfoBo;
+import org.dromara.wms.domain.vo.BaseMaterialInfoVo;
+import org.dromara.wms.domain.vo.ProdOrderInfoVo;
+import org.dromara.wms.mapper.BaseMaterialInfoMapper;
+import org.dromara.wms.mapper.ProdOrderInfoMapper;
+import org.dromara.wms.service.IProdOrderInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 生产订单信息Service业务层处理
+ *
+ * @author Yinq
+ * @date 2025-01-09
+ */
+@RequiredArgsConstructor
+@Service
+public class ProdOrderInfoServiceImpl implements IProdOrderInfoService {
+
+    private final ProdOrderInfoMapper baseMapper;
+
+//    private final ProdBaseProdLineInfoMapper prodBaseProdLineInfoMapper;
+//
+//    private final ProdBaseRouteMapper prodBaseRouteMapper;
+//
+//    private final ProdBaseProcessInfoMapper prodBaseProcessInfoMapper;
+
+    private final BaseMaterialInfoMapper baseMaterialInfoMapper;
+
+//    @DubboReference
+//    private final RemoteCodeRuleService remoteCodeRuleService;
+
+    /**
+     * 查询生产订单信息
+     *
+     * @param productOrderId 主键
+     * @return 生产订单信息
+     */
+    @Override
+    public ProdOrderInfoVo queryById(Long productOrderId){
+        ProdOrderInfoVo prodOrderInfoVo = baseMapper.selectVoById(productOrderId);
+        //根据dispatchType查询对应的名称
+        String dispatchType = prodOrderInfoVo.getDispatchType();
+//        switch (dispatchType) {
+//            // 1:产线 2:工艺路线 3:工序
+//            case "1":
+//                prodOrderInfoVo.setDispatchName(prodBaseProdLineInfoMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getProdLineName());
+//                break;
+//            case "2":
+//                prodOrderInfoVo.setDispatchName(prodBaseRouteMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getRouteName());
+//                break;
+//            case "3":
+//                prodOrderInfoVo.setDispatchName(prodBaseProcessInfoMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getProcessName());
+//                break;
+//            default:
+//                break;
+//        }
+        //根据materialId查询对应的名称和编码
+        Long materialId = prodOrderInfoVo.getMaterialId();
+        if (materialId != null) {
+            BaseMaterialInfoVo baseMaterialInfo = baseMaterialInfoMapper.selectVoById(materialId);
+            prodOrderInfoVo.setMaterialName(baseMaterialInfo.getMaterialName());
+            prodOrderInfoVo.setMaterialCode(baseMaterialInfo.getMaterialCode());
+        }
+        return prodOrderInfoVo;
+    }
+
+    /**
+     * 分页查询生产订单信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 生产订单信息分页列表
+     */
+    @Override
+    public TableDataInfo<ProdOrderInfoVo> queryPageList(ProdOrderInfoBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<ProdOrderInfo> lqw = buildQueryWrapper(bo);
+        Page<ProdOrderInfoVo> result = baseMapper.selectProdOrderInfoList(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的生产订单信息列表
+     *
+     * @param bo 查询条件
+     * @return 生产订单信息列表
+     */
+    @Override
+    public List<ProdOrderInfoVo> queryList(ProdOrderInfoBo bo) {
+        MPJLambdaWrapper<ProdOrderInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<ProdOrderInfo> buildQueryWrapper(ProdOrderInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<ProdOrderInfo> lqw = JoinWrappers.lambda(ProdOrderInfo.class)
+        .selectAll(ProdOrderInfo.class)
+        .eq(bo.getProductOrderId() != null, ProdOrderInfo::getProductOrderId, bo.getProductOrderId())
+        .eq(StringUtils.isNotBlank(bo.getOrderCode()), ProdOrderInfo::getOrderCode, bo.getOrderCode())
+        .eq(bo.getSaleOrderId() != null, ProdOrderInfo::getSaleOrderId, bo.getSaleOrderId())
+        .eq(StringUtils.isNotBlank(bo.getProjectNo()), ProdOrderInfo::getProjectNo, bo.getProjectNo())
+        .eq(StringUtils.isNotBlank(bo.getOrderType()), ProdOrderInfo::getOrderType, bo.getOrderType())
+        .eq(bo.getMaterialId() != null, ProdOrderInfo::getMaterialId, bo.getMaterialId())
+        .eq(bo.getMaterialBomId() != null, ProdOrderInfo::getMaterialBomId, bo.getMaterialBomId())
+        .eq(StringUtils.isNotBlank(bo.getDispatchType()), ProdOrderInfo::getDispatchType, bo.getDispatchType())
+        .eq(bo.getDispatchId() != null, ProdOrderInfo::getDispatchId, bo.getDispatchId())
+        .eq(bo.getSaleAmount() != null, ProdOrderInfo::getSaleAmount, bo.getSaleAmount())
+        .eq(bo.getPlanDeliveryDate() != null, ProdOrderInfo::getPlanDeliveryDate, bo.getPlanDeliveryDate())
+        .eq(bo.getPlanAmount() != null, ProdOrderInfo::getPlanAmount, bo.getPlanAmount())
+        .eq(bo.getDispatchAmount() != null, ProdOrderInfo::getDispatchAmount, bo.getDispatchAmount())
+        .eq(bo.getCompleteAmount() != null, ProdOrderInfo::getCompleteAmount, bo.getCompleteAmount())
+        .eq(bo.getReleaseTime() != null, ProdOrderInfo::getReleaseTime, bo.getReleaseTime())
+        .eq(bo.getPlanBeginTime() != null, ProdOrderInfo::getPlanBeginTime, bo.getPlanBeginTime())
+        .eq(bo.getPlanEndTime() != null, ProdOrderInfo::getPlanEndTime, bo.getPlanEndTime())
+        .eq(bo.getRealBeginTime() != null, ProdOrderInfo::getRealBeginTime, bo.getRealBeginTime())
+        .eq(bo.getRealEndTime() != null, ProdOrderInfo::getRealEndTime, bo.getRealEndTime())
+        .eq(StringUtils.isNotBlank(bo.getOrderStatus()), ProdOrderInfo::getOrderStatus, bo.getOrderStatus())
+        .eq(StringUtils.isNotBlank(bo.getStockLockFlag()), ProdOrderInfo::getStockLockFlag, bo.getStockLockFlag())
+        .eq(bo.getPreOrderId() != null, ProdOrderInfo::getPreOrderId, bo.getPreOrderId())
+        .eq(StringUtils.isNotBlank(bo.getPreOrderCode()), ProdOrderInfo::getPreOrderCode, bo.getPreOrderCode())
+        .eq(StringUtils.isNotBlank(bo.getFinishFlag()), ProdOrderInfo::getFinishFlag, bo.getFinishFlag())
+        .eq(StringUtils.isNotBlank(bo.getReleaseFlag()), ProdOrderInfo::getReleaseFlag, bo.getReleaseFlag())
+        .eq(StringUtils.isNotBlank(bo.getOrderVersion()), ProdOrderInfo::getOrderVersion, bo.getOrderVersion())
+        .eq(bo.getFactoryId() != null, ProdOrderInfo::getFactoryId, bo.getFactoryId())
+        .orderByDesc(ProdOrderInfo::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增生产订单信息
+     *
+     * @param bo 生产订单信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProdOrderInfoBo bo) {
+//        String orderCode = remoteCodeRuleService.selectCodeRuleCode("1");
+//        bo.setOrderCode(orderCode);
+        ProdOrderInfo add = MapstructUtils.convert(bo, ProdOrderInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setProductOrderId(add.getProductOrderId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改生产订单信息
+     *
+     * @param bo 生产订单信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProdOrderInfoBo bo) {
+        ProdOrderInfo update = MapstructUtils.convert(bo, ProdOrderInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProdOrderInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除生产订单信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/ProdOrderInfoMapper.xml

@@ -0,0 +1,30 @@
+<?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.dromara.wms.mapper.ProdOrderInfoMapper">
+
+    <select id="selectProdOrderInfoList" parameterType="ProdOrderInfoBo" resultType="ProdOrderInfoVo">
+        select
+        <if test="ew.getSqlSelect != null">
+            ${ew.getSqlSelect},
+            bmi.material_name,
+            CASE
+            WHEN t.dispatch_type = 1 THEN pli.prod_line_name
+            WHEN t.dispatch_type = 2 THEN rt.route_name
+            WHEN t.dispatch_type = 3 THEN pi.process_name
+            ELSE NULL
+            END AS dispatchName
+        </if>
+        <if test="ew.getSqlSelect == null">
+            *
+        </if>
+        from prod_order_info t
+        left join base_material_info bmi on bmi.material_id = t.material_id
+        left join prod_base_prod_line_info pli on t.dispatch_type = 1 and pli.prod_line_id = t.dispatch_id
+        left join prod_base_route rt on t.dispatch_type = 2 and rt.route_id = t.dispatch_id
+        left join prod_base_process_info pi on t.dispatch_type = 3 and pi.process_id = t.dispatch_id
+        ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>