feat:排产修改相同订单，相同产品色号数量为0补色号信息修改

zkqy-custom-business/src/main/java/com/zkqy/business/controller/AmmunitionPlanInformationIntermediateTableController.java

@@ -50,7 +50,6 @@ public class AmmunitionPlanInformationIntermediateTableController extends BaseCo
     }
 
 
-
     /**
      * 查询加弹计划信息列表
      */

zkqy-custom-business/src/main/java/com/zkqy/business/controller/DetailsOfTheRefuelingPlanSpinningController.java

@@ -95,7 +95,6 @@ public class DetailsOfTheRefuelingPlanSpinningController extends BaseController
     /**
      * 新增纺丝计划详细信息
      */
-//    //@PreAuthorize("@ss.hasPermi('system:spinning:add')")
     @Log(title = "纺丝计划详细信息", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增纺丝计划详细信息")

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/SaleProductsMapper.java

@@ -162,4 +162,10 @@ public interface SaleProductsMapper
      */
     int deleteSaleProductsBySaleNos(List<String> saleNos);
 
+    /**
+     * 修改状态为0的，批号,任务名称，色号，母粒信息
+     * @param saleProducts2
+     * @return
+     */
+    int updateSaleProductByColoursAndSaleOrderNoAndProductNoAndNumber(SaleProducts saleProducts2);
 }

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

@@ -82,12 +82,32 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
             item.setCreateById(SecurityUtils.getUserId());
             item.setCreateTime(new Date());
             saleProductsList.add(saleProducts);
-            //产品对应的信息
-//            SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));
-//            item.setProductTypeName(saleProducts1.getProductName());
-//            item.setCreateBy(SecurityUtils.getUsername());
-//            item.setCreateById(SecurityUtils.getUserId());
-//            item.setCreateTime(new Date());
+
+            //原来的色号
+            String colours = saleProducts1.getColours();
+            //订单号
+            String saleOrderNo = saleProducts1.getSaleOrderNo();//订单号
+            //产品号
+            String productNo = saleProducts1.getProductNo();//产品编号
+            //数量为0的
+            String  number="0";
+            SaleProducts saleProducts2=new SaleProducts();
+            saleProducts2.setColours(colours);
+            saleProducts2.setSaleOrderNo(saleOrderNo);
+            saleProducts2.setProductNo(productNo);
+            saleProducts2.setProductNumber(0.0);
+
+            //原来的批号
+            String lotNumber = item.getCurrentLotNumber();
+            saleProducts2.setLotNumber(lotNumber);
+            //产品
+            String taskName= saleProducts1.getProductName()+"-"+item.getCurrentColorCode();
+            saleProducts2.setTaskName(taskName);
+            //色泽编号
+            String colourNumber=item.getColourNumber();
+            saleProducts2.setColourNumber(colourNumber);
+            //改数量为0的相同产品色号的
+            saleProductsMapper.updateSaleProductByColoursAndSaleOrderNoAndProductNoAndNumber(saleProducts2);
         });
         //更新产线
         saleProductsList.forEach(item -> {

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

@@ -307,6 +307,34 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
             }
             saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
             saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
+
+            //原来的色号
+            String colours = saleProducts1.getColours();
+            //订单号
+            String saleOrderNo = saleProducts1.getSaleOrderNo();//订单号
+            //产品号
+            String productNo = saleProducts1.getProductNo();//产品编号
+            //数量为0的
+            String  number="0";
+            SaleProducts saleProducts2=new SaleProducts();
+            saleProducts2.setColours(colours);
+            saleProducts2.setSaleOrderNo(saleOrderNo);
+            saleProducts2.setProductNo(productNo);
+            saleProducts2.setProductNumber(0.0);
+
+            //原来的批号
+            String lotNumber = item.getCurrentLotNumber().toString();
+            saleProducts2.setLotNumber(lotNumber);
+            //产品
+            String taskName= saleProducts1.getProductName()+"-"+item.getCurrentColorCode();
+            saleProducts2.setTaskName(taskName);
+            //色泽编号
+            String colourNumber=item.getColourNumber();
+            saleProducts2.setColourNumber(colourNumber);
+            //改数量为0的相同产品色号的
+            saleProductsMapper.updateSaleProductByColoursAndSaleOrderNoAndProductNoAndNumber(saleProducts2);
+
+            //日志信息
             DetailsOfTheRefuelingPlanSpinningLogs detailsOfTheRefuelingPlanSpinningLogs=new DetailsOfTheRefuelingPlanSpinningLogs();
             BeanUtils.copyProperties(item,detailsOfTheRefuelingPlanSpinningLogs);
             detailsOfTheRefuelingPlanSpinningLogs.setCreateBy(SecurityUtils.getUsername());
@@ -317,9 +345,11 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
             detailsOfTheRefuelingPlanSpinningLogs.setOperation("0");
             detailsOfTheRefuelingPlanSpinningLogsMapper.insertDetailsOfTheRefuelingPlanSpinningLogs(detailsOfTheRefuelingPlanSpinningLogs);
         });
+
+
         //更新产线
         int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
-        if(saleProductsList2.size()>0){
+        if(saleProductsList2.size()>0){//上机更新产线
             //更新产线
             int i3= saleProductsMapper.updateSaleProductBatch(saleProductsList2);
         }

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

@@ -141,7 +141,7 @@
         Inner Join {DBNAME}.customer as cs ON so.sale_custom_no= cs.custom_no
         inner join {DBNAME}.production as pd on sp.product_no= pd.product_no
         left join {DBNAME}.production_line as pl on sp.production_line_no=pl.id
-        where sp.del_flag = '0' and cs.del_flag = '0'
+        where sp.del_flag = '0' and cs.del_flag = '0'  AND sp.product_number > 0.0
         AND so.order_type = 2 and so.`status`in (3,4) and sp.`status` in (3,4,6)
         <if test="saleProductNo != null  and saleProductNo != ''">and sale_product_no = #{saleProductNo}</if>
         <if test="saleOrderNo != null  and saleOrderNo != ''">and sale_order_no = #{saleOrderNo}</if>
@@ -345,7 +345,7 @@
             #{id}
         </foreach>
     </update>
-    <update id="updateSaleProductBatch">
+    <update id="updateSaleProductBatch" >
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update {DBNAME}.sale_products
             <set>
@@ -655,5 +655,19 @@
             #{saleNo}
         </foreach>
     </update>
+    <update id="updateSaleProductByColoursAndSaleOrderNoAndProductNoAndNumber">
+        update {DBNAME}.sale_products
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="colourNumber != null">colour_number = #{colourNumber},</if>
+            <if test="taskName != null">task_name = #{taskName},</if>
+            <if test="lotNumber != null">lot_number = #{lotNumber},</if>
+        </trim>
+        <where>
+            <if test="saleOrderNo != null">and sale_order_no = #{saleOrderNo}</if>
+            <if test="productNo != null">and product_no = #{productNo}</if>
+            <if test="colours != null"> and colours = #{colours}</if>
+            and product_number = 0.00
+        </where>
+    </update>
 
 </mapper>

zkqy-laboratory-information/src/main/java/com/zkqy/laboratory/domain/DetectionResult.java

@@ -152,7 +152,24 @@ public class DetectionResult extends BaseEntity
     @Excel(name = "温度")
     private  String temperature;
 
+    @Excel(name = "温度")
+    private  String experStandard;
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getExperStandard() {
+        return experStandard;
+    }
 
+    public void setExperStandard(String experStandard) {
+        this.experStandard = experStandard;
+    }
 
     public String getWtNumber() {
         return wtNumber;

zkqy-laboratory-information/src/main/resources/mapper/DetectionResultMapper.xml

@@ -42,10 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskProcessKey"    column="task_process_key"    />
         <result property="taskNodeKey"    column="task_node_key"    />
         <result property="wtNumber"    column="wt_number"    />
+        <result property="temperature"    column="temperature"    />
+        <result property="experStandard"    column="exper_standard"    />
     </resultMap>
 
     <sql id="selectDetectionResultVo">
-        select id, serial_number, `date`, lot_number, specification, alloy_state, manufacturer, tensile_value_mpa, rate_of_elongation, fracture_deformation, maximum_force, tensile_strength_avg, fracture_force_rate_avg, repeat_survey, product_type, production_direction, tensile_value_mpa_two, rate_of_elongation_two, standard, decision_result, lsl_one, usl, lsl2, inspector, performance_creation_time, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key, task_process_key, task_node_key,wt_number from {DBNAME}.detection_result
+        select id, serial_number, `date`, lot_number, specification, alloy_state, manufacturer, tensile_value_mpa, rate_of_elongation, fracture_deformation,
+               maximum_force, tensile_strength_avg, fracture_force_rate_avg, repeat_survey, product_type, production_direction, tensile_value_mpa_two,
+               rate_of_elongation_two, standard, decision_result, lsl_one, usl, lsl2, inspector, performance_creation_time, remark, create_by_id, create_by,
+               create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key, task_process_key, task_node_key,wt_number,temperature,exper_standard
+        from {DBNAME}.detection_result
     </sql>
 
     <select id="selectDetectionResultList" parameterType="com.zkqy.laboratory.domain.DetectionResult" resultMap="DetectionResultResult">
@@ -82,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskProcessKey != null  and taskProcessKey != ''"> and task_process_key = #{taskProcessKey}</if>
             <if test="taskNodeKey != null  and taskNodeKey != ''"> and task_node_key = #{taskNodeKey}</if>
             <if test="wtNumber != null  and wtNumber != ''"> and wt_number = #{wtNumber}</if>
+            <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
+            <if test="experStandard != null  and experStandard != ''"> and exper_standard = #{experStandard}</if>
         </where>
         order by id desc
     </select>
@@ -130,7 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processKey != null">process_key,</if>
             <if test="taskProcessKey != null">task_process_key,</if>
             <if test="taskNodeKey != null">task_node_key,</if>
-            <if test="wtNumber != null  and wtNumber != ''">wt_number</if>
+            <if test="wtNumber != null  and wtNumber != ''">wt_number,</if>
+            <if test="temperature != null  and temperature != ''">temperature,</if>
+            <if test="experStandard != null  and experStandard != ''">exper_standard</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null">#{serialNumber},</if>
@@ -169,7 +179,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processKey != null">#{processKey},</if>
             <if test="taskProcessKey != null">#{taskProcessKey},</if>
             <if test="taskNodeKey != null">#{taskNodeKey},</if>
-            <if test="wtNumber != null  and wtNumber != ''">#{wtNumber}</if>
+            <if test="wtNumber != null  and wtNumber != ''">#{wtNumber},</if>
+            <if test="temperature != null  and temperature != ''">#{temperature},</if>
+            <if test="experStandard != null  and experStandard != ''">#{experStandard}</if>
          </trim>
     </insert>
 
@@ -212,7 +224,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processKey != null">process_key = #{processKey},</if>
             <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
-            <if test="wtNumber != null  and wtNumber != ''">wt_number=#{wtNumber}</if>
+            <if test="wtNumber != null  and wtNumber != ''">wt_number=#{wtNumber},</if>
+            <if test="temperature != null  and temperature != ''">temperature=#{temperature},</if>
+            <if test="experStandard != null  and experStandard != ''">exper_standard=#{experStandard}</if>
         </trim>
         where id = #{id}
     </update>

zkqy-ui/src/views/lims/chemicalTesting/chemicalTestingDetection.vue

@@ -64,7 +64,7 @@
 <!--
             <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>-->
 <!--              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>-->
-              <el-dropdown-item  icon="el-icon-edit"   v-hasPermi="['lims:bggl:hxysjcjg:ckfj']"    command="catbg">查看报告</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-edit"   v-hasPermi="['lims:bggl:hxysjcjg:ckfj']"    command="catbg">报告预览</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>

zkqy-ui/src/views/lims/detectionResult/detectionDetection.vue

@@ -83,7 +83,7 @@
             <el-dropdown-menu slot="dropdown">
 <!--              <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>-->
 <!--              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>-->
-              <el-dropdown-item  icon="el-icon-edit" v-hasPermi="['lims:ypjc:jcgc:ckfj']"    command="catbg">查看报告</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-edit" v-hasPermi="['lims:ypjc:jcgc:ckfj']"    command="catbg">报告预览</el-dropdown-item>
               <el-dropdown-item  icon="el-icon-edit" v-hasPermi="['lims:ypjc:jcgc:ckfj']"  v-if="scope.row.dataApprovalStatus==1||scope.row.dataApprovalStatus==0"  command="bgsh">报告审核</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

zkqy-ui/src/views/lims/report/chemicalTestingDetectionReport.vue

@@ -64,7 +64,7 @@
 <!--
             <el-dropdown-item  icon="el-icon-edit"  command="handleUpdate">修改</el-dropdown-item>-->
 <!--              <el-dropdown-item  icon="el-icon-delete" command="handleDelete">删除</el-dropdown-item>-->
-              <el-dropdown-item  icon="el-icon-edit"   v-hasPermi="['lims:bggl:hxysjcjg:ckfj']"    command="catbg">查看报告</el-dropdown-item>
+              <el-dropdown-item  icon="el-icon-edit"   v-hasPermi="['lims:bggl:hxysjcjg:ckfj']"    command="catbg">报告预览</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>

zkqy-ui/src/views/lims/report/detectionDetectionReport.vue

@@ -66,7 +66,7 @@
     </el-row>
 
     <!-- 表格start -->
-    <selsetHeader style="margin-top: 20px" :tLength="9" :options="tableHeadData.slice(1, tableHeadData.length -1 )" @change="cascaderChangeFun"></selsetHeader>
+    <selsetHeader style="margin-top: 20px" :tLength="tl" :options="tableHeadData.slice(1, tableHeadData.length -1 )" @change="cascaderChangeFun"></selsetHeader>
     <el-table v-loading="loading"  style="margin-top:20px" ref="tableTree" :data="detectionResultList" @selection-change="handleSelectionChange">
       <el-table-column :prop="tableHeadData[0].value"  :label="tableHeadData[0].label" align="center" width="180"></el-table-column>
       <el-table-column v-for="(item, index) in optionsData" :key="index" :prop="item.value" :label="item.label" align="center">
@@ -215,6 +215,107 @@
     <!--文件预览-->
     <fileView visible.sync="fjzs" ref="fileView"></fileView>
 
+
+    <!-- 查看检测结果信息 -->
+    <el-dialog :title="title" :visible.sync="jgROpen" width="1200px" append-to-body>
+      <el-form ref="form" :model="jgForm" :rules="rules" label-width="100px">
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="实验日期" prop="date">
+              <el-date-picker clearable
+                              v-model="jgForm.date"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              style="width: 270.66px"
+                              placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实验机型" prop="processKey">
+              <el-input v-model="jgForm.processKey" placeholder="请输入实验机型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="温度" prop="temperature">
+              <el-input v-model="jgForm.temperature" placeholder="请输入温度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="实验标准" prop="experStandard">
+              <el-input v-model="jgForm.experStandard" placeholder="请输入实验标准" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格" prop="specification">
+              <el-input v-model="jgForm.specification" placeholder="请输入规格" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合金" prop="alloyState">
+              <el-input v-model="jgForm.alloyState" placeholder="请输入合金" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="试样客户名称" prop="manufacturer">
+              <el-input v-model="jgForm.manufacturer" placeholder="请输入实验标准" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="判定标准" prop="standard">
+              <el-input v-model="jgForm.standard" placeholder="请输入判定标准" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批号" prop="lotNumber">
+              <el-input v-model="jgForm.lotNumber" placeholder="请输入批号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="抗拉强度Mpa" prop="tensileValueMpaTwo">
+              <el-input v-model="jgForm.tensileValueMpaTwo" placeholder="请输入延伸率%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="延伸率%" prop="rateOfElongation">
+              <el-input v-model="jgForm.rateOfElongation" placeholder="请输入延伸率%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="判定结果" prop="decisionResult">
+              <el-input v-model="jgForm.decisionResult" placeholder="请输入判定结果" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="检验员" prop="inspector">
+              <el-input v-model="jgForm.inspector" placeholder="请输入检测员" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审核人" prop="taskNodeKey">
+              <el-input v-model="jgForm.taskNodeKey" placeholder="请输入审核人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -237,6 +338,9 @@ export default {
   dicts:["shzt"],
   data() {
     return {
+      jgForm:{},
+      tl:"9",
+      jgROpen:false,
       fjzs:false,
       // 用户导入参数
       // upload: {
@@ -402,8 +506,15 @@ export default {
           break;
       }
     },
-    ckbgsj(){
+    ckbgsj(row){
       console.log("查看报告");
+      this.jgForm={};
+      getDetectionResult(row.id).then(resp=>{
+        console.log(resp)
+        this.jgROpen=true;
+        this.jgForm=resp.data
+        this.title="查看检测报告详情";
+      })
       debugger;
     },
     bgsh(row){