添加生产订单

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

@@ -0,0 +1,46 @@
+package com.fjhx.mes.controller.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.vo.ProduceOrderVo;
+import com.fjhx.mes.service.produce.ProduceOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 生产订单 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@RestController
+@RequestMapping("/produceOrder")
+public class ProduceOrderController {
+
+    @Autowired
+    private ProduceOrderService produceOrderService;
+
+    /**
+     * 生产订单分页
+     */
+    @PostMapping("/page")
+    public Page<ProduceOrderVo> page(@RequestBody ProduceOrderSelectDto dto) {
+        return produceOrderService.getPage(dto);
+    }
+
+    /**
+     * 创建生产订单
+     */
+    @PostMapping("/createOrder")
+    public void createOrder(@RequestBody ProduceOrderDto produceOrderDto) {
+        produceOrderService.createOrder(produceOrderDto);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.fjhx.mes.controller.produce;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 生产订单明细 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@RestController
+@RequestMapping("/produceOrderDetail")
+public class ProduceOrderDetailController {
+
+
+}

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

@@ -0,0 +1,17 @@
+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/ProduceOrderDetailSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.produce.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产订单明细列表查询入参实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProduceOrderDetailSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,17 @@
+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/dto/ProduceOrderSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.produce.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 生产订单列表查询入参实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProduceOrderSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,52 @@
+package com.fjhx.mes.entity.produce.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 生产订单
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+@TableName("produce_order")
+public class ProduceOrder extends BasePo {
+	/**
+	 * 合同id
+	 */
+	private Long contractId;
+
+	/**
+	 * 订单号
+	 */
+	private String code;
+
+	/**
+	 * 交期
+	 */
+	private Date deliveryPeriod;
+
+	/**
+	 * 生产公司
+	 */
+	private Long produceCompanyId;
+
+	/**
+	 * 生产状态 0未开始 1进行中 2已完成
+	 */
+	private Integer produceStatus;
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+
+}

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

@@ -0,0 +1,63 @@
+package com.fjhx.mes.entity.produce.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 生产订单明细
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+@TableName("produce_order_detail")
+public class ProduceOrderDetail extends BasePo {
+
+    /**
+     * 生产订单id
+     */
+    private Long produceOrderId;
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 合同明细id
+     */
+    private Long contractDetailId;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 订单数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 完成数量
+     */
+    private BigDecimal finishQuantity;
+
+    /**
+     * 生产状态 0未开始 1进行中 2已完成
+     */
+    private Integer produceStatus;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+}

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

@@ -0,0 +1,50 @@
+package com.fjhx.mes.entity.produce.vo;
+
+import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 生产订单明细列表查询返回值实体
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Getter
+@Setter
+public class ProduceOrderDetailVo extends ProduceOrderDetail {
+
+	/**
+	 * 产品名称
+	 */
+	private String productName;
+	/**
+	 * 产品编号
+	 */
+	private String productCode;
+	/**
+	 * 产品规格
+	 */
+	private String productSpec;
+	/**
+	 * 产品单位
+	 */
+	private String productUnit;
+
+	/**
+	 * 产品长
+	 */
+	private BigDecimal productLength;
+	/**
+	 * 产品宽
+	 */
+	private BigDecimal productWidth;
+	/**
+	 * 产品高
+	 */
+	private BigDecimal productHeight;
+
+
+}

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

@@ -0,0 +1,21 @@
+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/mapper/produce/ProduceOrderDetailMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.mapper.produce;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
+
+
+/**
+ * <p>
+ * 生产订单明细 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+public interface ProduceOrderDetailMapper extends BaseMapper<ProduceOrderDetail> {
+
+}

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

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.produce;
+
+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.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 生产订单 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+public interface ProduceOrderMapper extends BaseMapper<ProduceOrder> {
+
+    /**
+     * 生产订单分页
+     */
+    Page<ProduceOrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProduceOrder> wrapper);
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.mes.service.produce;
+
+import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 生产订单明细 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+public interface ProduceOrderDetailService extends BaseService<ProduceOrderDetail> {
+
+}

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

@@ -0,0 +1,31 @@
+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/produce/impl/ProduceOrderDetailServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.mes.service.produce.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mes.entity.produce.po.ProduceOrderDetail;
+import com.fjhx.mes.mapper.produce.ProduceOrderDetailMapper;
+import com.fjhx.mes.service.produce.ProduceOrderDetailService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 生产订单明细 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-01-10
+ */
+@Service
+public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetailMapper, ProduceOrderDetail> implements ProduceOrderDetailService {
+
+}

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

@@ -0,0 +1,130 @@
+package com.fjhx.mes.service.produce.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+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.sale.entity.contract.po.Contract;
+import com.fjhx.sale.entity.contract.po.ContractProduct;
+import com.fjhx.sale.service.contract.ContractProductService;
+import com.fjhx.sale.service.contract.ContractService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 生产订单 服务实现类
+ * </p>
+ *
+ * @since 2024-01-10
+ */
+@Service
+public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, ProduceOrder> implements ProduceOrderService {
+
+	@Autowired
+	private ContractService contractService;
+	@Autowired
+	private ContractProductService contractProductService;
+	@Autowired
+	private ProduceOrderDetailService produceOrderDetailService;
+	@Autowired
+	private ISysDeptService sysDeptService;
+	@Autowired
+	private ProductInfoService productInfoService;
+
+	@Override
+	public Page<ProduceOrderVo> getPage(ProduceOrderSelectDto dto) {
+		IWrapper<ProduceOrder> wrapper = getWrapper();
+		wrapper.orderByDesc("po", ProduceOrder::getId);
+		Page<ProduceOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+		List<ProduceOrderVo> 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.eq(ProduceOrderDetail::getProduceOrderId, produceOrderIds));
+		List<ProduceOrderDetailVo> produceOrderDetailVos = BeanUtil.copyToList(produceOrderDetailList, ProduceOrderDetailVo.class);
+
+		productInfoService.attributeAssign(produceOrderDetailVos, ProduceOrderDetail::getProductId, (item, product) -> {
+			item.setProductCode(product.getCustomCode());
+			item.setProductName(product.getName());
+			item.setProductUnit(product.getUnit());
+			item.setProductSpec(product.getSpec());
+			item.setProductLength(product.getLength());
+			item.setProductWidth(product.getWidth());
+			item.setProductHeight(product.getHeight());
+		});
+
+		Map<Long, List<ProduceOrderDetailVo>> produceOrderDetailMap = produceOrderDetailVos.stream()
+				.collect(Collectors.groupingBy(ProduceOrderDetail::getProduceOrderId));
+		for (ProduceOrderVo record : records) {
+			record.setProduceOrderDetailList(produceOrderDetailMap.get(record.getId()));
+		}
+
+		return page;
+	}
+
+	@Override
+	@DSTransactional
+	public void createOrder(ProduceOrderDto produceOrderDto) {
+		Long contractId = produceOrderDto.getContractId();
+		Assert.notEmpty(produceOrderDto.getContractId(), "合同id不能为空！");
+
+		//将数据移到归属公司下
+		SysDept produceCompany = sysDeptService.getById(produceOrderDto.getProduceCompanyId());
+		Assert.notEmpty(produceCompany, "查询不到生产公司信息");
+		String tenantId = produceCompany.getTenantId();
+		produceOrderDto.setTenantId(tenantId);
+
+		//获取合同信息
+		Contract contract = contractService.getById(contractId);
+		Assert.notEmpty(contract, "查询不到合同信息！");
+		contractService.update(q -> q.eq(Contract::getId, contractId).set(Contract::getOrderDistributeStatus, 1));
+
+		produceOrderDto.setCode(contract.getCode());
+		produceOrderDto.setProduceStatus(0);
+		this.save(produceOrderDto);
+
+		//创建生产订单明细
+		List<ProduceOrderDetail> produceOrderDetailList = 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);
+		}
+		produceOrderDetailService.saveBatch(produceOrderDetailList);
+	}
+
+}

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

@@ -0,0 +1,4 @@
+<?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">
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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>