feat:日志信息优化

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

@@ -128,7 +128,7 @@ public class DetailsOfTheRefuelingPlanSpinningController extends BaseController
         return toAjax(detailsOfTheRefuelingPlanSpinningService.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning));
     }
 
-//    //@PreAuthorize("@ss.hasPermi('system:spinning:edit')")
+//  //@PreAuthorize("@ss.hasPermi('system:spinning:edit')")
     @Log(title = "纺丝计划详细信息", businessType = BusinessType.UPDATE)
     @PutMapping("/update/updateSpinningInfoPlanOne")
     @ApiOperation(value = "修改纺丝计划详细信息")

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

@@ -47,9 +47,10 @@ public class SaleProductsController extends BaseController {
     public AjaxResult getProducts(@RequestParam("productionLineNo") String productionLineNo) {
         //销售单什么状态为3的(待生产)
         SaleProducts saleProducts=new SaleProducts();
-        saleProducts.setStatus("3");
-        saleProducts.setProductionLineNo(productionLineNo); //不查在当前产线投产过的产品了
+//        saleProducts.setStatus("3");
+//        saleProducts.setProductionLineNo(productionLineNo); //不查在当前产线投产过的产品了
         List<SaleProductsVo> list = saleProductsService.selectSaleProductsListAndCustomerName(saleProducts);
+
         return AjaxResult.success(list);
     }
 

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

@@ -207,6 +207,7 @@ public class DetailsOfTheRefuelingPlanServiceImpl implements IDetailsOfTheRefuel
             detailsOfTheRefuelingPlanLogs.setCreateBy(SecurityUtils.getUsername());
             detailsOfTheRefuelingPlanLogs.setCreateById(SecurityUtils.getUserId());
             detailsOfTheRefuelingPlanLogs.setCreateTime(new Date());
+            detailsOfTheRefuelingPlanLogs.setOperation("0");
             //查询这产品对应的订单信息
             detailsOfTheRefuelingPlanLogsMapper.insertDetailsOfTheRefuelingPlanLogs(detailsOfTheRefuelingPlanLogs);
         }

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

@@ -219,7 +219,9 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         detailsOfTheRefuelingPlanSpinningLogs.setCreateTime(new Date());
         detailsOfTheRefuelingPlanSpinningLogs.setMacId(Long.parseLong(spinning.getMacId()));//机台id
         detailsOfTheRefuelingPlanSpinningLogs.setOrderId(spinning.getSalesmanId());//订单
+        detailsOfTheRefuelingPlanSpinningLogs.setPlanStatus(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//重置为当前选择的状态
         detailsOfTheRefuelingPlanSpinningLogs.setOperation("3"); //0新增 1删除 2修改
+        detailsOfTheRefuelingPlanSpinningLogs.setPlanType(detailsOfTheRefuelingPlanSpinning.getPlanType());
         //插入日志信息
         detailsOfTheRefuelingPlanSpinningLogsMapper.insertDetailsOfTheRefuelingPlanSpinningLogs(detailsOfTheRefuelingPlanSpinningLogs);
         //修改产品上机状态

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

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join   {DBNAME}.materiel as m on sp.colour_number= m.materiel_code
         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' and m.del_flag = '0' and so.order_type=2
+        where sp.del_flag = '0' and cs.del_flag = '0' and m.del_flag = '0' and so.order_type=2 and  so.status=3 or so.status=4 or so.status=5
         <if test="saleProductNo != null  and saleProductNo != ''"> and sale_product_no = #{saleProductNo}</if>
             <if test="saleOrderNo != null  and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
             <if test="productNo != null  and productNo != ''"> and product_no = #{productNo}</if>
@@ -121,7 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null  and taskNodeKey != ''"> and task_node_key = #{taskNodeKey}</if>
             <if test="processKey != null  and processKey != ''"> and process_key = #{processKey}</if>
             <if test="status != null  and status != ''"> and sp.status = #{status}</if>
-            <if test="productionLineNo != null  and productionLineNo != ''"> AND sp.production_line_no IS NULL or sp.status =3 and pl.production_line_no NOT lIKE CONCAT(#{productionLineNo}, '%' )</if>
+<!--            <if test="productionLineNo != null  and productionLineNo != ''"> AND sp.production_line_no IS NULL or sp.status =3 and pl.production_line_no NOT lIKE CONCAT(#{productionLineNo}, '%' )</if>-->
+
             <if test="sliceType != null  and sliceType != ''"> and slice_type = #{sliceType}</if>
             <if test="colourNumber != null  and colourNumber != ''"> and colour_number = #{colourNumber}</if>
             <if test="lotNumber != null  and lotNumber != ''"> and lot_number = #{lotNumber}</if>

zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -426,6 +426,10 @@ export default {
         //把当前行变成可编辑的
         row.isEditing = true;
         this.editingRowIndex = rowIndex;
+      }else {
+        //把当前行变成可编辑的
+        row.isEditing = true;
+        this.editingRowIndex = rowIndex;
       }
 
     },
@@ -433,15 +437,22 @@ export default {
     handleInputBlur(row) {
       let rowIndex = this.tableData2.indexOf(row);
       //编辑索引不等于当前编辑行索引
-      if (this.editingRowIndex !== rowIndex) {
-        if (this.isRowFilled(row)) {
-          row.isEditing = false;
-          //对于整个表格来说
-          this.isEditLine = false;
-          //当前编辑行置为-1
-          this.editingRowIndex = -1;
-        }
+      if(row.isEditing="true"){
+        row.isEditing = false;
+        //对于整个表格来说
+        this.isEditLine = false;
+        //当前编辑行置为-1
+        this.editingRowIndex = -1;
       }
+      // if (this.editingRowIndex !== rowIndex) {
+      //   if (this.isRowFilled(row)) {
+      //     row.isEditing = false;
+      //     //对于整个表格来说
+      //     this.isEditLine = false;
+      //     //当前编辑行置为-1
+      //     this.editingRowIndex = -1;
+      //   }
+      // }
     },
     // 检查行是否填写完毕的示例方法
     isRowFilled(row) {
@@ -594,11 +605,14 @@ export default {
       });
     },
     // 更新状态
-    updateStatus(ind, row,planStatus){
+    updateStatus(ind, row){
+      row.planType="纺丝计划"
+      console.log(row,"当前行数据---------------------------")
       if(!this.isRowFilled(row)){
         this.$message({message: '请完善当前行数据', type: 'warning'});
         return;
       }
+      // if(row.planType="")
       //判断当前计划是否已经投产
       getIsTheOrderProductProduced({"id":row.id}).then(resp=>{
         if(resp.data.length>0){
@@ -624,6 +638,7 @@ export default {
                     this.$message({message: '已停机，请先处理停机产品，然后上机', type: 'warning'});
                     return;//证明有在上级的产品--zhi能有一个上级产品
                   }else {
+                      row.playType="纺丝计划"
                       updateSpinningInfoPlanOne(row).then(response=>{
                         if (response.code == 200) {
                           this.$message({
@@ -697,7 +712,6 @@ export default {
         }
 
       })
-
     }
   }
 }

zkqy-ui/src/views/orderMange/planTable/fankuang.vue

@@ -426,6 +426,10 @@ export default {
         //把当前行变成可编辑的
         row.isEditing = true;
         this.editingRowIndex = rowIndex;
+      }else {
+        //把当前行变成可编辑的
+        row.isEditing = true;
+        this.editingRowIndex = rowIndex;
       }
 
     },
@@ -433,15 +437,23 @@ export default {
     handleInputBlur(row) {
       let rowIndex = this.tableData2.indexOf(row);
       //编辑索引不等于当前编辑行索引
-      if (this.editingRowIndex !== rowIndex) {
-        if (this.isRowFilled(row)) {
-          row.isEditing = false;
-          //对于整个表格来说
-          this.isEditLine = false;
-          //当前编辑行置为-1
-          this.editingRowIndex = -1;
-        }
+      if(row.isEditing="true"){
+        row.isEditing = false;
+        //对于整个表格来说
+        this.isEditLine = false;
+        //当前编辑行置为-1
+        this.editingRowIndex = -1;
       }
+      //编辑索引不等于当前编辑行索引
+      // if (this.editingRowIndex !== rowIndex) {
+      //   if (this.isRowFilled(row)) {
+      //     row.isEditing = false;
+      //     //对于整个表格来说
+      //     this.isEditLine = false;
+      //     //当前编辑行置为-1
+      //     this.editingRowIndex = -1;
+      //   }
+      // }
     },
     // 检查行是否填写完毕的示例方法
     isRowFilled(row) {
@@ -595,6 +607,7 @@ export default {
     },
     // 更新状态
     updateStatus(ind, row,planStatus){
+      row.planType="翻框计划"
       if(!this.isRowFilled(row)){
         this.$message({message: '请完善当前行数据', type: 'warning'});
         return;

zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -417,7 +417,7 @@
           <el-form ref="form"  :model="formData" label-width="80px" :inline="true">
             <el-form-item label="产品类别:">
               <el-select v-model="formData.productType" placeholder="请选择产品类别">
-                <el-option v-for="product in productTypeList" :key="product.value" :label="product.lable" :value="product.value" ></el-option>
+                <el-option v-for="(product,index) in productTypeList" :key="index" :label="product.lable" :value="product.value" ></el-option>
               </el-select>
             </el-form-item>
 

zkqy-ui/src/views/orderMange/planTable/luotong.vue

@@ -426,6 +426,10 @@ export default {
         //把当前行变成可编辑的
         row.isEditing = true;
         this.editingRowIndex = rowIndex;
+      }else {
+        //把当前行变成可编辑的
+        row.isEditing = true;
+        this.editingRowIndex = rowIndex;
       }
 
     },
@@ -433,15 +437,23 @@ export default {
     handleInputBlur(row) {
       let rowIndex = this.tableData2.indexOf(row);
       //编辑索引不等于当前编辑行索引
-      if (this.editingRowIndex !== rowIndex) {
-        if (this.isRowFilled(row)) {
-          row.isEditing = false;
-          //对于整个表格来说
-          this.isEditLine = false;
-          //当前编辑行置为-1
-          this.editingRowIndex = -1;
-        }
+      if(row.isEditing="true"){
+        row.isEditing = false;
+        //对于整个表格来说
+        this.isEditLine = false;
+        //当前编辑行置为-1
+        this.editingRowIndex = -1;
       }
+      //编辑索引不等于当前编辑行索引
+      // if (this.editingRowIndex !== rowIndex) {
+      //   if (this.isRowFilled(row)) {
+      //     row.isEditing = false;
+      //     //对于整个表格来说
+      //     this.isEditLine = false;
+      //     //当前编辑行置为-1
+      //     this.editingRowIndex = -1;
+      //   }
+      // }
     },
     // 检查行是否填写完毕的示例方法
     isRowFilled(row) {
@@ -594,7 +606,8 @@ export default {
       });
     },
     // 更新状态
-    updateStatus(ind, row,planStatus){
+    updateStatus(ind, row){
+      row.planType="络筒计划"
       if(!this.isRowFilled(row)){
         this.$message({message: '请完善当前行数据', type: 'warning'});
         return;