添加产品颜色

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

@@ -117,14 +117,16 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
 	 */
 	private Date produceTime;
 
-	/**
-	 * 生产公司Id
-	 */
-	private String companyName;
+    /**
+     * 生产公司Id
+     */
+    private String companyName;
 
-	/**
-	 * 是否逾期
-	 */
-	private Integer isOverdue;
+    /**
+     * 是否逾期
+     */
+    private Integer isOverdue;
+
+    private String productColor;
 
 }

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

@@ -123,6 +123,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             item.setProductLength(rawMaterial.getLength());
             item.setProductWidth(rawMaterial.getWidth());
             item.setProductHeight(rawMaterial.getHeight());
+            item.setProductColor(rawMaterial.getColor());
         });
         Map<Long, ContractProductBomVo> rawMaterialMap = contractProductBomVoList.stream().collect(Collectors.toMap(ContractProductBomVo::getContractProductId, Function.identity()));
 
@@ -150,6 +151,8 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
                 record.setProductLength(product.getLength());
                 record.setProductWidth(product.getWidth());
                 record.setProductHeight(product.getHeight());
+                record.setProductColor(product.getColor());
+
             }
 
             //赋值原材料信息
@@ -208,6 +211,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             detail.setProductLength(product.getLength());
             detail.setProductWidth(product.getWidth());
             detail.setProductHeight(product.getHeight());
+            detail.setProductColor(product.getColor());
         });
         //赋值产品备注
         contractProductService.attributeAssign(voList, ProductionOrderDetailVo::getContractDetailId, (detail, product) -> {
@@ -225,7 +229,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             item.setProductLength(product1.getLength());
             item.setProductWidth(product1.getWidth());
             item.setProductHeight(product1.getHeight());
-
+            item.setProductColor(product1.getColor());
         });
         Map<Long, List<ContractProductBomVo>> bomMap = cpBomVoList.stream().collect(Collectors.groupingBy(ContractProductBom::getContractProductId));
         //获取原材料
@@ -252,6 +256,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
                 detail.setRawMaterialLength(rawMaterialBom.getProductLength());
                 detail.setRawMaterialWidth(rawMaterialBom.getProductWidth());
                 detail.setRawMaterialHeight(rawMaterialBom.getProductHeight());
+                detail.setProductColor(rawMaterialBom.getProductColor());
             }
             //赋值BOM信息
             detail.setContractProductBomList(otherBomMap.get(detail.getContractDetailId()));

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

@@ -152,6 +152,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             item.setProductLength(product.getLength());
             item.setProductWidth(product.getWidth());
             item.setProductHeight(product.getHeight());
+            item.setProductColor(product.getColor());
         });
 
         Map<Long, List<ProductionOrderDetailVo>> produceOrderDetailMap = produceOrderDetailVos.stream().collect(Collectors.groupingBy(ProductionOrderDetail::getProduceOrderId));

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

@@ -22,7 +22,8 @@
 			   po.produce_time,
 			   po.delivery_period,
 			   po.company_id,
-			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue
+			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
+			   pod.remark
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 			${ew.customSqlSegment}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductBomVo.java

@@ -21,5 +21,6 @@ public class ContractProductBomVo extends ContractProductBom {
     private BigDecimal productLength;
     private BigDecimal productWidth;
     private BigDecimal productHeight;
+    private String productColor;
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -78,6 +78,8 @@ public class ContractProductVo extends ContractProduct {
      */
     private String productType;
 
+    private String productColor;
+
     /**
      * 产品图片地址
      */

hx-sale/src/main/java/com/fjhx/sale/entity/ext/vo/ExtQuotationProductBomVo.java

@@ -24,4 +24,6 @@ public class ExtQuotationProductBomVo extends ExtQuotationProductBom {
     private BigDecimal productWidth;
     private BigDecimal productHeight;
 
+    private String productColor;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/ext/vo/ExtQuotationProductVo.java

@@ -23,6 +23,7 @@ public class ExtQuotationProductVo extends ExtQuotationProduct {
     private BigDecimal productLength;
     private BigDecimal productWidth;
     private BigDecimal productHeight;
+    private String productColor;
 
     /**
      * 生产图片地址

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/vo/QuotationProductBomVo.java

@@ -23,5 +23,6 @@ public class QuotationProductBomVo extends QuotationProductBom {
     private BigDecimal productLength;
     private BigDecimal productWidth;
     private BigDecimal productHeight;
+    private String productColor;
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/vo/QuotationProductVo.java

@@ -24,4 +24,6 @@ public class QuotationProductVo extends QuotationProduct {
     private BigDecimal productWidth;
     private BigDecimal productHeight;
 
+    private String productColor;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -441,6 +441,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             item.setProductLength(productInfo.getLength());
             item.setProductWidth(productInfo.getWidth());
             item.setProductHeight(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
         });
         //赋值产品图片信息
         List<Long> productIds = contractProductVos.stream().map(ContractProduct::getProductId).distinct().collect(Collectors.toList());
@@ -1184,6 +1185,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                 item.setProductLength(productInfo.getLength());
                 item.setProductWidth(productInfo.getWidth());
                 item.setProductHeight(productInfo.getHeight());
+                item.setProductColor(productInfo.getColor());
             });
             cpbMap = contractProductBomVos.stream().collect(Collectors.groupingBy(ContractProductBom::getContractProductId));
         }
@@ -1201,6 +1203,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             item.setProductLength(product.getLength());
             item.setProductWidth(product.getWidth());
             item.setProductHeight(product.getHeight());
+            item.setProductColor(product.getColor());
         });
         //重新赋值待采购数量
         List<EhsdPurchaseProduct> purchaseProducts = ehsdPurchaseProductService.getPurchaseProductByContractProductIds(contractProductIds);

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -147,6 +147,11 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         productInfoService.attributeAssign(quotationProductVos, ExtQuotationProductVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCustomCode());
             item.setProductName(productInfo.getName());
+
+            item.setProductLength(productInfo.getLength());
+            item.setProductWidth(productInfo.getWidth());
+            item.setProductWidth(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
         });
         Map<Long, List<ExtQuotationProductVo>> pMap = quotationProductVos.stream().collect(Collectors.groupingBy(ExtQuotationProduct::getSaleQuotationId));
 
@@ -190,59 +195,6 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         }
 
         return setDetailInfo(Arrays.asList(result)).get(0);
-
-//        //赋值买方公司名称(客户)
-//        Customer customer = customerService.getById(result.getBuyCorporationId());
-//        if (ObjectUtil.isNotEmpty(customer)) {
-//            result.setBuyCorporationName(customer.getName());
-//        }
-//
-//        //赋值买方公司地址
-//        setArea(result);
-//        //查询报价-商品表的详情
-//        List<ExtQuotationProduct> quotationProductList = extQuotationProductService.list(Wrappers.<ExtQuotationProduct>lambdaQuery()
-//                .eq(ExtQuotationProduct::getSaleQuotationId, result.getId()));
-//
-//        List<ExtQuotationProductVo> quotationProductVos = BeanUtil.copyToList(quotationProductList, ExtQuotationProductVo.class);
-//        //赋值产品信息
-//        productInfoService.attributeAssign(quotationProductVos, ExtQuotationProductVo::getProductId, (item, productInfo) -> {
-//            item.setProductCode(productInfo.getCustomCode());
-//            item.setProductName(productInfo.getName());
-//            item.setProductLength(productInfo.getLength());
-//            item.setProductWidth(productInfo.getWidth());
-//            item.setProductHeight(productInfo.getHeight());
-//            item.setProductProdImgPath(productInfo.getProdImgPath());
-//        });
-//
-//        //获取配件列表
-//        List<Long> ids = quotationProductVos.stream().map(ExtQuotationProduct::getId).collect(Collectors.toList());
-//        List<ExtQuotationProductBom> list = extQuotationProductBomService.list(q -> q.in(ExtQuotationProductBom::getQuotationProductId, ids));
-//        List<ExtQuotationProductBomVo> quotationProductBomVos = BeanUtil.copyToList(list, ExtQuotationProductBomVo.class);
-//        //赋值产品信息
-//        productInfoService.attributeAssign(quotationProductBomVos, ExtQuotationProductBom::getMaterialId, (item, productInfo) -> {
-//            item.setProductCode(productInfo.getCustomCode());
-//            item.setProductName(productInfo.getName());
-//            item.setProductLength(productInfo.getLength());
-//            item.setProductWidth(productInfo.getWidth());
-//            item.setProductHeight(productInfo.getHeight());
-//        });
-//
-//        Map<Long, List<ExtQuotationProductBomVo>> qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(ExtQuotationProductBom::getQuotationProductId));
-//
-//        for (ExtQuotationProductVo quotationProductVo : quotationProductVos) {
-//            quotationProductVo.setQuotationProductBomList(qpbMap.get(quotationProductVo.getId()));
-//        }
-//        result.setQuotationProductList(quotationProductVos);
-//
-//        //赋值报价金额趋势
-//        List<ExtQuotation> quotationTrendList = this.list(q -> q
-//                .eq(ExtQuotation::getGroupId, result.getGroupId())
-//                .ne(ExtQuotation::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
-//                .orderByAsc(ExtQuotation::getCreateTime)
-//        );
-//        result.setQuotationTrendList(quotationTrendList);
-//
-//        return result;
     }
 
     @Override
@@ -410,6 +362,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
             item.setProductLength(productInfo.getLength());
             item.setProductWidth(productInfo.getWidth());
             item.setProductHeight(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
         });
         //获取配件列表
         List<Long> qpIds = productList.stream().map(ExtQuotationProduct::getId).collect(Collectors.toList());
@@ -424,6 +377,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
                 item.setProductLength(productInfo.getLength());
                 item.setProductWidth(productInfo.getWidth());
                 item.setProductHeight(productInfo.getHeight());
+                item.setProductColor(productInfo.getColor());
             });
             qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(ExtQuotationProductBom::getQuotationProductId));
         }

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -180,6 +180,12 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         productInfoService.attributeAssign(quotationPayVos, QuotationProductVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCustomCode());
             item.setProductName(productInfo.getName());
+
+            item.setProductLength(productInfo.getLength());
+            item.setProductWidth(productInfo.getWidth());
+            item.setProductWidth(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
+
         });
         Map<Long, List<QuotationProductVo>> pMap = quotationPayVos.stream().collect(Collectors.groupingBy(QuotationProduct::getSaleQuotationId));
 
@@ -330,61 +336,6 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         }
 
         return setDetailInfo(Arrays.asList(result)).get(0);
-//
-//        //赋值买方公司名称(客户)
-//        Customer customer = customerService.getById(result.getBuyCorporationId());
-//        if (ObjectUtil.isNotEmpty(customer)) {
-//            result.setBuyCorporationName(customer.getName());
-//        }
-//
-//        //赋值买方公司地址
-//        setArea(result);
-//        //查询报价-商品表的详情
-//        List<QuotationProduct> quotationProductList = quotationProductService.list(Wrappers.<QuotationProduct>lambdaQuery()
-//                .eq(QuotationProduct::getSaleQuotationId, result.getId()));
-//
-//        List<QuotationProductVo> quotationProductVos = BeanUtil.copyToList(quotationProductList, QuotationProductVo.class);
-//        //赋值产品信息
-//        productInfoService.attributeAssign(quotationProductVos, QuotationProductVo::getProductId, (item, productInfo) -> {
-//            item.setProductCode(productInfo.getCustomCode());
-//            item.setProductName(productInfo.getName());
-//            item.setProductLength(productInfo.getLength());
-//            item.setProductWidth(productInfo.getWidth());
-//            item.setProductHeight(productInfo.getHeight());
-//        });
-//
-//        //获取配件列表
-//        Map<Long, List<QuotationProductBomVo>> qpbMap = new HashMap<>();
-//        List<Long> ids = quotationProductVos.stream().map(QuotationProduct::getId).collect(Collectors.toList());
-//        if (ObjectUtil.isNotEmpty(ids)) {
-//            List<QuotationProductBom> list = quotationProductBomService.list(q -> q.in(QuotationProductBom::getQuotationProductId, ids));
-//
-//            List<QuotationProductBomVo> quotationProductBomVos = BeanUtil.copyToList(list, QuotationProductBomVo.class);
-//            //赋值产品信息
-//            productInfoService.attributeAssign(quotationProductBomVos, QuotationProductBom::getMaterialId, (item, productInfo) -> {
-//                item.setProductCode(productInfo.getCustomCode());
-//                item.setProductName(productInfo.getName());
-//                item.setProductLength(productInfo.getLength());
-//                item.setProductWidth(productInfo.getWidth());
-//                item.setProductHeight(productInfo.getHeight());
-//            });
-//
-//            qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(QuotationProductBom::getQuotationProductId));
-//        }
-//        for (QuotationProductVo quotationProductVo : quotationProductVos) {
-//            quotationProductVo.setQuotationProductBomList(qpbMap.get(quotationProductVo.getId()));
-//        }
-//        result.setQuotationProductList(quotationProductVos);
-//
-//        //赋值报价金额趋势
-//        List<SaleQuotation> quotationTrendList = this.list(q -> q
-//                .eq(SaleQuotation::getGroupId, result.getGroupId())
-//                .ne(SaleQuotation::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
-//                .orderByAsc(SaleQuotation::getCreateTime)
-//        );
-//        result.setQuotationTrendList(quotationTrendList);
-//
-//        return result;
     }
 
     @Override
@@ -424,6 +375,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
             item.setProductLength(productInfo.getLength());
             item.setProductWidth(productInfo.getWidth());
             item.setProductHeight(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
         });
         //获取配件列表
         List<Long> qpIds = productList.stream().map(QuotationProduct::getId).collect(Collectors.toList());
@@ -438,6 +390,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
                 item.setProductLength(productInfo.getLength());
                 item.setProductWidth(productInfo.getWidth());
                 item.setProductHeight(productInfo.getHeight());
+                item.setProductColor(productInfo.getColor());
             });
             qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(QuotationProductBom::getQuotationProductId));
         }