报工明细添加产品信息

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

@@ -4,6 +4,8 @@ import com.fjhx.mes.entity.production.po.ProductionReportingDetail;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 生产报工明细列表查询返回值实体
  *
@@ -36,4 +38,35 @@ public class ProductionReportingDetailVo extends ProductionReportingDetail {
      */
     private String userName;
 
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品编号
+     */
+    private String productCode;
+    /**
+     * 产品长
+     */
+    private BigDecimal productLength;
+    /**
+     * 产品宽
+     */
+    private BigDecimal productWidth;
+    /**
+     * 产品高
+     */
+    private BigDecimal productHeight;
+    /**
+     * 产品颜色
+     */
+    private String productColor;
+
 }

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

@@ -57,7 +57,6 @@ import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -721,10 +720,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             //创建生产任务
             createOrderDetails(productionOrder);
 
-            //投产
-            if (ObjectUtil.isNotEmpty(productionOrder.getProduceTime())) {
-                throw new ServiceException("该订单已投产，请勿重复投产！！");
-            }
+//            //投产
+//            if (ObjectUtil.isNotEmpty(productionOrder.getProduceTime())) {
+//                throw new ServiceException("该订单已投产，请勿重复投产！！");
+//            }
 
             //生成待备料
             createMaterialPreparation(productionOrder);

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

@@ -5,6 +5,7 @@ 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.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailSelectDto;
 import com.fjhx.mes.entity.production.po.ProductionReportingDetail;
@@ -37,10 +38,12 @@ import java.util.stream.Collectors;
 public class ProductionReportingDetailServiceImpl extends ServiceImpl<ProductionReportingDetailMapper, ProductionReportingDetail> implements ProductionReportingDetailService {
 
     private final ISysUserService sysUserService;
+    private final ProductInfoService productInfoService;
 
     @Autowired
-    public ProductionReportingDetailServiceImpl(ISysUserService sysUserService) {
+    public ProductionReportingDetailServiceImpl(ISysUserService sysUserService, ProductInfoService productInfoService) {
         this.sysUserService = sysUserService;
+        this.productInfoService = productInfoService;
     }
 
     @Override
@@ -85,6 +88,16 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
             record.setCompanyName(companyNameMap.get(record.getCompanyId()));
         }
 
+        //赋值产品信息
+        productInfoService.attributeAssign(records, ProductionReportingDetailVo::getProductId, (item, productInfo) -> {
+            item.setProductName(productInfo.getName());
+            item.setProductCode(productInfo.getCustomCode());
+            item.setProductLength(productInfo.getLength());
+            item.setProductWidth(productInfo.getWidth());
+            item.setProductHeight(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
+        });
+
         return page;
     }
 

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

@@ -13,7 +13,8 @@
                po.`code` AS orderCode,
                pp.`name` AS processesName,
                prd.company_id,
-               prd.user_id
+               prd.user_id,
+               pod.product_id
         FROM production_reporting_detail prd
                  LEFT JOIN production_order_detail pod ON prd.production_task_id = pod.id
                  LEFT JOIN production_order po ON pod.produce_order_id = po.id