feat:改产品数据

zkqy-custom-business/src/main/java/com/zkqy/business/domain/vo/ProductInvoiceFinancialExportVo.java

@@ -3,7 +3,6 @@ package com.zkqy.business.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zkqy.common.annotation.Excel;
 import com.zkqy.common.core.domain.BaseEntity;
-import jdk.jfr.Timestamp;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/AmmunitionPlanInformationIntermediateTableServiceImpl.java

@@ -76,7 +76,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
             saleProducts.setColourNumber(item.getColourNumber());//色号编码
             SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));//插叙对应产品信息
             item.setProductTypeName(saleProducts1.getProductName());
-            saleProducts.setTaskName(saleProducts1.getProductName()+item.getCurrentColorCode()); //产品的任务名称
+            saleProducts.setTaskName(saleProducts1.getProductName()+"-"+item.getCurrentColorCode()); //产品的任务名称
             item.setProductTypeName(saleProducts1.getProductName());
             item.setCreateBy(SecurityUtils.getUsername());
             item.setCreateById(SecurityUtils.getUserId());

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java

@@ -298,7 +298,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
             saleProducts.setColourNumber(item.getColourNumber());
             //产品对应的信息
             SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));
-            saleProducts.setTaskName(saleProducts1.getProductName()+item.getCurrentColorCode());
+            saleProducts.setTaskName(saleProducts1.getProductName()+"-"+item.getCurrentColorCode());
             //产品对应的信息
             item.setProductTypeName(saleProducts1.getProductName());
             saleProductsList.add(saleProducts);

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -352,7 +352,9 @@
                 production_line_no=#{item.productionLineNo},
                 lot_number=#{item.lotNumber},
                 on_board_state=#{item.onBoardState},
-                product_number=#{item.productNumber}
+                product_number=#{item.productNumber},
+                colour_number = #{item.colourNumber},
+                task_name=#{item.taskName},
             </set>
             where id = #{item.id}
         </foreach>
@@ -360,7 +362,12 @@
     <update id="updateSaleProduct">
         update {DBNAME}.sale_products
         set
-            production_line_no=#{productionLineNo}, lot_number=#{lotNumber}, on_board_state=#{onBoardState}, product_number=#{productNumber}
+            production_line_no=#{productionLineNo},
+            lot_number=#{lotNumber},
+            colour_number = #{colourNumber},
+            task_name=#{taskName},
+            on_board_state=#{onBoardState},
+            product_number=#{productNumber}
         where id = #{id}
     </update>
     <update id="updateSaleProductsNull">