文件重命名

hx-mes/src/main/java/com/fjhx/mes/controller/produce/ProduceOrderController.java → hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderController.java

@@ -1,10 +1,10 @@
-package com.fjhx.mes.controller.produce;
+package com.fjhx.mes.controller.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDto;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderSelectDto;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderVo;
-import com.fjhx.mes.service.produce.ProduceOrderService;
+import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
+import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
+import com.fjhx.mes.service.production.ProduceOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,7 +31,7 @@ public class ProduceOrderController {
      * 生产订单分页
      */
     @PostMapping("/page")
-    public Page<ProduceOrderVo> page(@RequestBody ProduceOrderSelectDto dto) {
+    public Page<ProductionOrderVo> page(@RequestBody ProduceOrderSelectDto dto) {
         return produceOrderService.getPage(dto);
     }
 
@@ -39,7 +39,7 @@ public class ProduceOrderController {
      * 创建生产订单
      */
     @PostMapping("/createOrder")
-    public void createOrder(@RequestBody ProduceOrderDto produceOrderDto) {
+    public void createOrder(@RequestBody ProductionOrderDto produceOrderDto) {
         produceOrderService.createOrder(produceOrderDto);
     }
 

hx-mes/src/main/java/com/fjhx/mes/controller/produce/ProduceOrderDetailController.java → hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderDetailController.java

@@ -1,9 +1,9 @@
-package com.fjhx.mes.controller.produce;
+package com.fjhx.mes.controller.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDetailSelectDto;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo;
-import com.fjhx.mes.service.produce.ProduceOrderDetailService;
+import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
+import com.fjhx.mes.service.production.ProduceOrderDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,7 +30,7 @@ public class ProduceOrderDetailController {
      * 生产任务分页
      */
     @PostMapping("/page")
-    public Page<ProduceOrderDetailVo> page(@RequestBody ProduceOrderDetailSelectDto dto) {
+    public Page<ProductionOrderDetailVo> page(@RequestBody ProduceOrderDetailSelectDto dto) {
         return produceOrderDetailService.getPage(dto);
     }
 

hx-mes/src/main/java/com/fjhx/mes/entity/produce/dto/ProduceOrderDetailDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mes.entity.produce.dto;
-
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 生产订单明细新增编辑入参实体
- *
- * @author
- * @since 2024-01-10
- */
-@Getter
-@Setter
-public class ProduceOrderDetailDto extends ProduceOrderDetail {
-
-}

hx-mes/src/main/java/com/fjhx/mes/entity/produce/dto/ProduceOrderDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mes.entity.produce.dto;
-
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 生产订单新增编辑入参实体
- *
- * @author
- * @since 2024-01-10
- */
-@Getter
-@Setter
-public class ProduceOrderDto extends ProduceOrder {
-
-}

hx-mes/src/main/java/com/fjhx/mes/entity/produce/vo/ProduceOrderVo.java

@@ -1,21 +0,0 @@
-package com.fjhx.mes.entity.produce.vo;
-
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 生产订单列表查询返回值实体
- *
- * @author
- * @since 2024-01-10
- */
-@Getter
-@Setter
-public class ProduceOrderVo extends ProduceOrder {
-
-	private List<ProduceOrderDetailVo> produceOrderDetailList;
-
-}

hx-mes/src/main/java/com/fjhx/mes/entity/produce/dto/ProduceOrderDetailSelectDto.java → hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderDetailSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.mes.entity.produce.dto;
+package com.fjhx.mes.entity.production.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseSelectDto;

hx-mes/src/main/java/com/fjhx/mes/entity/produce/dto/ProduceOrderSelectDto.java → hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.mes.entity.produce.dto;
+package com.fjhx.mes.entity.production.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseSelectDto;

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionOrderDetailDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.production.dto;
+
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产订单明细新增编辑入参实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProductionOrderDetailDto extends ProductionOrderDetail {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionOrderDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.production.dto;
+
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产订单新增编辑入参实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProductionOrderDto extends ProductionOrder {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/produce/po/ProduceOrder.java → hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrder.java

@@ -1,4 +1,4 @@
-package com.fjhx.mes.entity.produce.po;
+package com.fjhx.mes.entity.production.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
@@ -17,17 +17,17 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@TableName("produce_order")
-public class ProduceOrder extends BasePo {
-	/**
-	 * 合同id
-	 */
-	private Long contractId;
-
-	/**
-	 * 订单号
-	 */
-	private String code;
+@TableName("production_order")
+public class ProductionOrder extends BasePo {
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 订单号
+     */
+    private String code;
 
 	/**
 	 * 交期

hx-mes/src/main/java/com/fjhx/mes/entity/produce/po/ProduceOrderDetail.java → hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrderDetail.java

@@ -1,4 +1,4 @@
-package com.fjhx.mes.entity.produce.po;
+package com.fjhx.mes.entity.production.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
@@ -18,8 +18,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@TableName("produce_order_detail")
-public class ProduceOrderDetail extends BasePo {
+@TableName("production_order_detail")
+public class ProductionOrderDetail extends BasePo {
 
     /**
      * 生产订单id

hx-mes/src/main/java/com/fjhx/mes/entity/produce/vo/ProduceOrderDetailVo.java → hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -1,7 +1,6 @@
-package com.fjhx.mes.entity.produce.vo;
+package com.fjhx.mes.entity.production.vo;
 
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import com.fjhx.mes.entity.production.vo.ProductionProcessesVo;
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,17 +16,17 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ProduceOrderDetailVo extends ProduceOrderDetail {
+public class ProductionOrderDetailVo extends ProductionOrderDetail {
 
-	/**
-	 * 订单变化
-	 */
-	private String orderCode;
+    /**
+     * 订单变化
+     */
+    private String orderCode;
 
-	/**
-	 * 订单创建时间
-	 */
-	private Date orderCreateTime;
+    /**
+     * 订单创建时间
+     */
+    private Date orderCreateTime;
 
 	/**
 	 * 产品名称

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -0,0 +1,21 @@
+package com.fjhx.mes.entity.production.vo;
+
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 生产订单列表查询返回值实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProductionOrderVo extends ProductionOrder {
+
+    private List<ProductionOrderDetailVo> produceOrderDetailList;
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/produce/ProduceOrderDetailMapper.java → hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProduceOrderDetailMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.mes.mapper.produce;
+package com.fjhx.mes.mapper.production;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo;
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,11 +16,11 @@ import org.apache.ibatis.annotations.Param;
  * @author
  * @since 2024-01-10
  */
-public interface ProduceOrderDetailMapper extends BaseMapper<ProduceOrderDetail> {
+public interface ProduceOrderDetailMapper extends BaseMapper<ProductionOrderDetail> {
 
     /**
      * 生产订单分页
      */
-    Page<ProduceOrderDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProduceOrderDetail> wrapper);
+    Page<ProductionOrderDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionOrderDetail> wrapper);
 
 }

hx-mes/src/main/java/com/fjhx/mes/mapper/produce/ProduceOrderMapper.java → hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProduceOrderMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.mes.mapper.produce;
+package com.fjhx.mes.mapper.production;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderVo;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,11 +16,11 @@ import org.apache.ibatis.annotations.Param;
  * @author
  * @since 2024-01-10
  */
-public interface ProduceOrderMapper extends BaseMapper<ProduceOrder> {
+public interface ProduceOrderMapper extends BaseMapper<ProductionOrder> {
 
     /**
      * 生产订单分页
      */
-    Page<ProduceOrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProduceOrder> wrapper);
+    Page<ProductionOrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionOrder> wrapper);
 
 }

hx-mes/src/main/java/com/fjhx/mes/service/produce/ProduceOrderDetailService.java

@@ -1,24 +0,0 @@
-package com.fjhx.mes.service.produce;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDetailSelectDto;
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- * 生产订单明细 服务类
- * </p>
- *
- * @author
- * @since 2024-01-10
- */
-public interface ProduceOrderDetailService extends BaseService<ProduceOrderDetail> {
-
-	/**
-	 * 生产任务分页
-	 */
-	Page<ProduceOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto);
-}

hx-mes/src/main/java/com/fjhx/mes/service/produce/ProduceOrderService.java

@@ -1,31 +0,0 @@
-package com.fjhx.mes.service.produce;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDto;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderSelectDto;
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderVo;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- * 生产订单 服务类
- * </p>
- *
- * @author
- * @since 2024-01-10
- */
-public interface ProduceOrderService extends BaseService<ProduceOrder> {
-
-    /**
-     * 生产订单分页
-     */
-    Page<ProduceOrderVo> getPage(ProduceOrderSelectDto dto);
-
-    /**
-     * 生产订单新增
-     */
-    void createOrder(ProduceOrderDto produceOrderDto);
-
-}

hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderDetailService.java

@@ -0,0 +1,24 @@
+package com.fjhx.mes.service.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 生产订单明细 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+public interface ProduceOrderDetailService extends BaseService<ProductionOrderDetail> {
+
+	/**
+	 * 生产任务分页
+	 */
+	Page<ProductionOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto);
+}

hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderService.java

@@ -0,0 +1,31 @@
+package com.fjhx.mes.service.production;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 生产订单 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+public interface ProduceOrderService extends BaseService<ProductionOrder> {
+
+    /**
+     * 生产订单分页
+     */
+    Page<ProductionOrderVo> getPage(ProduceOrderSelectDto dto);
+
+    /**
+     * 生产订单新增
+     */
+    void createOrder(ProductionOrderDto produceOrderDto);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/produce/impl/ProduceOrderDetailServiceImpl.java → hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -1,17 +1,17 @@
-package com.fjhx.mes.service.produce.impl;
+package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDetailSelectDto;
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo;
+import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.entity.production.vo.ProductionProcessesVo;
-import com.fjhx.mes.mapper.produce.ProduceOrderDetailMapper;
+import com.fjhx.mes.mapper.production.ProduceOrderDetailMapper;
 import com.fjhx.mes.mapper.production.ProductionProcessesMapper;
-import com.fjhx.mes.service.produce.ProduceOrderDetailService;
+import com.fjhx.mes.service.production.ProduceOrderDetailService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * @since 2024-01-10
  */
 @Service
-public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetailMapper, ProduceOrderDetail> implements ProduceOrderDetailService {
+public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetailMapper, ProductionOrderDetail> implements ProduceOrderDetailService {
 
     @Autowired
     private ProductInfoService productInfoService;
@@ -40,31 +40,31 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     private ProductionProcessesMapper productionProcessesMapper;
 
     @Override
-    public Page<ProduceOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto) {
-        IWrapper<ProduceOrderDetail> wrapper = getWrapper();
+    public Page<ProductionOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto) {
+        IWrapper<ProductionOrderDetail> wrapper = getWrapper();
 
         //生产状态
-        wrapper.eq("pod", ProduceOrderDetail::getProduceStatus, dto.getProduceStatus());
+        wrapper.eq("pod", ProductionOrderDetail::getProduceStatus, dto.getProduceStatus());
         //交期-时间范围过滤
-        wrapper.ge("po", ProduceOrder::getDeliveryPeriod, dto.getStaDeliveryPeriod());
-        wrapper.le("po", ProduceOrder::getDeliveryPeriod, dto.getEndDeliveryPeriod());
+        wrapper.ge("po", ProductionOrder::getDeliveryPeriod, dto.getStaDeliveryPeriod());
+        wrapper.le("po", ProductionOrder::getDeliveryPeriod, dto.getEndDeliveryPeriod());
         //下单时间（创建时间）-时间范围过滤
-        wrapper.ge("po", ProduceOrder::getCreateTime, dto.getBeginTime());
-        wrapper.le("po", ProduceOrder::getCreateTime, dto.getEndTime());
+        wrapper.ge("po", ProductionOrder::getCreateTime, dto.getBeginTime());
+        wrapper.le("po", ProductionOrder::getCreateTime, dto.getEndTime());
         //关键字
-        wrapper.keyword(dto.getKeyword(), new SqlField("po", ProduceOrder::getCode));
+        wrapper.keyword(dto.getKeyword(), new SqlField("po", ProductionOrder::getCode));
 
-        wrapper.orderByDesc("po", ProduceOrder::getCreateTime);
-        wrapper.orderByDesc("pod", ProduceOrderDetail::getId);
+        wrapper.orderByDesc("po", ProductionOrder::getCreateTime);
+        wrapper.orderByDesc("pod", ProductionOrderDetail::getId);
 
-        Page<ProduceOrderDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<ProduceOrderDetailVo> records = page.getRecords();
+        Page<ProductionOrderDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ProductionOrderDetailVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {
             return page;
         }
 
         //赋值产品信息
-        productInfoService.attributeAssign(records, ProduceOrderDetail::getProductId, (item, product) -> {
+        productInfoService.attributeAssign(records, ProductionOrderDetail::getProductId, (item, product) -> {
             item.setProductCode(product.getCustomCode());
             item.setProductName(product.getName());
             item.setProductUnit(product.getUnit());
@@ -75,7 +75,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         });
 
         //赋值生产用时
-        for (ProduceOrderDetailVo record : records) {
+        for (ProductionOrderDetailVo record : records) {
             record.setUsageTime(0L);
             Date produceTime = record.getProduceTime();
             Date finishTime = record.getFinishTime();
@@ -86,11 +86,11 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         }
 
         //赋值工序列表
-        List<Long> pIds = records.stream().map(ProduceOrderDetail::getProductId).collect(Collectors.toList());
+        List<Long> pIds = records.stream().map(ProductionOrderDetail::getProductId).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(pIds)) {
             List<ProductionProcessesVo> processes = productionProcessesMapper.getProcessesByProductId(IWrapper.getWrapper().in("pi.id", pIds));
             Map<Long, List<ProductionProcessesVo>> processesMap = processes.stream().collect(Collectors.groupingBy(ProductionProcessesVo::getProductId));
-            for (ProduceOrderDetailVo record : records) {
+            for (ProductionOrderDetailVo record : records) {
                 List<ProductionProcessesVo> productionProcessesVo = processesMap.get(record.getProductId());
                 record.setProductionProcessesList(productionProcessesVo);
             }

hx-mes/src/main/java/com/fjhx/mes/service/produce/impl/ProduceOrderServiceImpl.java → hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.mes.service.produce.impl;
+package com.fjhx.mes.service.production.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderDto;
-import com.fjhx.mes.entity.produce.dto.ProduceOrderSelectDto;
-import com.fjhx.mes.entity.produce.po.ProduceOrder;
-import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo;
-import com.fjhx.mes.entity.produce.vo.ProduceOrderVo;
-import com.fjhx.mes.mapper.produce.ProduceOrderMapper;
-import com.fjhx.mes.service.produce.ProduceOrderDetailService;
-import com.fjhx.mes.service.produce.ProduceOrderService;
+import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
+import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
+import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
+import com.fjhx.mes.mapper.production.ProduceOrderMapper;
+import com.fjhx.mes.service.production.ProduceOrderDetailService;
+import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  * @since 2024-01-10
  */
 @Service
-public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, ProduceOrder> implements ProduceOrderService {
+public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, ProductionOrder> implements ProduceOrderService {
 
 	@Autowired
 	private ContractService contractService;
@@ -56,33 +56,33 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 	private ProductInfoService productInfoService;
 
 	@Override
-	public Page<ProduceOrderVo> getPage(ProduceOrderSelectDto dto) {
-		IWrapper<ProduceOrder> wrapper = getWrapper();
-		wrapper.orderByDesc("po", ProduceOrder::getId);
+	public Page<ProductionOrderVo> getPage(ProduceOrderSelectDto dto) {
+		IWrapper<ProductionOrder> wrapper = getWrapper();
+		wrapper.orderByDesc("po", ProductionOrder::getId);
 
 		//生产状态
-		wrapper.eq(ProduceOrder::getProduceStatus, dto.getProduceStatus());
+		wrapper.eq(ProductionOrder::getProduceStatus, dto.getProduceStatus());
 		//交期-时间范围过滤
-		wrapper.ge("po", ProduceOrder::getDeliveryPeriod, dto.getStaDeliveryPeriod());
-		wrapper.le("po", ProduceOrder::getDeliveryPeriod, dto.getEndDeliveryPeriod());
+		wrapper.ge("po", ProductionOrder::getDeliveryPeriod, dto.getStaDeliveryPeriod());
+		wrapper.le("po", ProductionOrder::getDeliveryPeriod, dto.getEndDeliveryPeriod());
 		//下单时间（创建时间）-时间范围过滤
-		wrapper.ge("po", ProduceOrder::getCreateTime, dto.getBeginTime());
-		wrapper.le("po", ProduceOrder::getCreateTime, dto.getEndTime());
+		wrapper.ge("po", ProductionOrder::getCreateTime, dto.getBeginTime());
+		wrapper.le("po", ProductionOrder::getCreateTime, dto.getEndTime());
 		//关键字
-		wrapper.keyword(dto.getKeyword(), new SqlField(ProduceOrder::getCode));
+		wrapper.keyword(dto.getKeyword(), new SqlField(ProductionOrder::getCode));
 
-		Page<ProduceOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-		List<ProduceOrderVo> records = page.getRecords();
+		Page<ProductionOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+		List<ProductionOrderVo> records = page.getRecords();
 		if (ObjectUtil.isEmpty(records)) {
 			return page;
 		}
 		//赋值订单明细信息
-		List<Long> produceOrderIds = records.stream().map(ProduceOrder::getId).collect(Collectors.toList());
-		List<ProduceOrderDetail> produceOrderDetailList = produceOrderDetailService.list(q ->
-				q.in(ProduceOrderDetail::getProduceOrderId, produceOrderIds));
-		List<ProduceOrderDetailVo> produceOrderDetailVos = BeanUtil.copyToList(produceOrderDetailList, ProduceOrderDetailVo.class);
+		List<Long> produceOrderIds = records.stream().map(ProductionOrder::getId).collect(Collectors.toList());
+		List<ProductionOrderDetail> productionOrderDetailList = produceOrderDetailService.list(q ->
+				q.in(ProductionOrderDetail::getProduceOrderId, produceOrderIds));
+		List<ProductionOrderDetailVo> produceOrderDetailVos = BeanUtil.copyToList(productionOrderDetailList, ProductionOrderDetailVo.class);
 
-		productInfoService.attributeAssign(produceOrderDetailVos, ProduceOrderDetail::getProductId, (item, product) -> {
+		productInfoService.attributeAssign(produceOrderDetailVos, ProductionOrderDetail::getProductId, (item, product) -> {
 			item.setProductCode(product.getCustomCode());
 			item.setProductName(product.getName());
 			item.setProductUnit(product.getUnit());
@@ -92,9 +92,9 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 			item.setProductHeight(product.getHeight());
 		});
 
-		Map<Long, List<ProduceOrderDetailVo>> produceOrderDetailMap = produceOrderDetailVos.stream()
-				.collect(Collectors.groupingBy(ProduceOrderDetail::getProduceOrderId));
-		for (ProduceOrderVo record : records) {
+		Map<Long, List<ProductionOrderDetailVo>> produceOrderDetailMap = produceOrderDetailVos.stream()
+				.collect(Collectors.groupingBy(ProductionOrderDetail::getProduceOrderId));
+		for (ProductionOrderVo record : records) {
 			record.setProduceOrderDetailList(produceOrderDetailMap.get(record.getId()));
 		}
 
@@ -103,7 +103,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 
 	@Override
 	@DSTransactional
-	public void createOrder(ProduceOrderDto produceOrderDto) {
+	public void createOrder(ProductionOrderDto produceOrderDto) {
 		Long contractId = produceOrderDto.getContractId();
 		Assert.notEmpty(produceOrderDto.getContractId(), "合同id不能为空！");
 
@@ -123,21 +123,21 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 		this.save(produceOrderDto);
 
 		//创建生产订单明细
-		List<ProduceOrderDetail> produceOrderDetailList = new ArrayList<>();
+		List<ProductionOrderDetail> productionOrderDetailList = new ArrayList<>();
 		List<ContractProduct> contractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, contractId));
 		for (ContractProduct contractProduct : contractProductList) {
-			ProduceOrderDetail produceOrderDetail = new ProduceOrderDetail();
-			produceOrderDetail.setProduceOrderId(produceOrderDto.getId());
-			produceOrderDetail.setContractId(contractId);
-			produceOrderDetail.setContractDetailId(contractProduct.getId());
-			produceOrderDetail.setProductId(contractProduct.getProductId());
-			produceOrderDetail.setQuantity(contractProduct.getQuantity());
-			produceOrderDetail.setFinishQuantity(BigDecimal.ZERO);
-			produceOrderDetail.setProduceStatus(0);
-			produceOrderDetail.setTenantId(tenantId);
-			produceOrderDetailList.add(produceOrderDetail);
+			ProductionOrderDetail productionOrderDetail = new ProductionOrderDetail();
+			productionOrderDetail.setProduceOrderId(produceOrderDto.getId());
+			productionOrderDetail.setContractId(contractId);
+			productionOrderDetail.setContractDetailId(contractProduct.getId());
+			productionOrderDetail.setProductId(contractProduct.getProductId());
+			productionOrderDetail.setQuantity(contractProduct.getQuantity());
+			productionOrderDetail.setFinishQuantity(BigDecimal.ZERO);
+			productionOrderDetail.setProduceStatus(0);
+			productionOrderDetail.setTenantId(tenantId);
+			productionOrderDetailList.add(productionOrderDetail);
 		}
-		produceOrderDetailService.saveBatch(produceOrderDetailList);
+		produceOrderDetailService.saveBatch(productionOrderDetailList);
 	}
 
 }

hx-mes/src/main/resources/mapper/produce/ProduceOrderMapper.xml

@@ -1,19 +0,0 @@
-<?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="com.fjhx.mes.mapper.produce.ProduceOrderMapper">
-	<select id="getPage" resultType="com.fjhx.mes.entity.produce.vo.ProduceOrderVo">
-		select
-		po.id,
-		po.contract_id,
-		po.code,
-		po.delivery_period,
-		po.produce_status,
-		po.create_user,
-		po.create_time,
-		po.update_user,
-		po.update_time
-		from produce_order po
-		${ew.customSqlSegment}
-	</select>
-
-</mapper>

hx-mes/src/main/resources/mapper/produce/ProduceOrderDetailMapper.xml → hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -1,7 +1,7 @@
 <?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="com.fjhx.mes.mapper.produce.ProduceOrderDetailMapper">
-	<select id="getPage" resultType="com.fjhx.mes.entity.produce.vo.ProduceOrderDetailVo">
+<mapper namespace="com.fjhx.mes.mapper.production.ProduceOrderDetailMapper">
+	<select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo">
 		SELECT pod.id,
 			   pod.produce_order_id,
 			   pod.contract_id,
@@ -21,8 +21,8 @@
 			   po.code        AS orderCode,
 			   po.create_time AS orderCreateTime,
 			   po.delivery_period
-		FROM produce_order_detail pod
-				 LEFT JOIN produce_order po ON pod.produce_order_id = po.id
+		FROM production_order_detail pod
+				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 			${ew.customSqlSegment}
 	</select>
 </mapper>

hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -0,0 +1,18 @@
+<?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="com.fjhx.mes.mapper.production.ProduceOrderMapper">
+	<select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionOrderVo">
+		select po.id,
+			   po.contract_id,
+			   po.code,
+			   po.delivery_period,
+			   po.produce_status,
+			   po.create_user,
+			   po.create_time,
+			   po.update_user,
+			   po.update_time
+		from production_order po
+			${ew.customSqlSegment}
+	</select>
+
+</mapper>