feat:流程结束，结束计划信息

zkqy-admin/src/main/java/com/zkqy/web/controller/common/CommonFileController.java

@@ -255,7 +255,7 @@ public class CommonFileController {
                     item.put(listMap.get(0).get(mKey), item.remove(mKey));
                 });
                 // 如果value为空就清空
-                item.entrySet().removeIf(entry -> entry.getValue() == null);
+//                item.entrySet().removeIf(entry -> entry.getValue() == null);
             });
             listMap.remove(0);
             CommonEntity commonEntity = new CommonEntity();

zkqy-admin/src/main/java/com/zkqy/web/controller/homepagestatistics/StatisticsController.java

@@ -63,7 +63,7 @@ public class StatisticsController {
      */
     @GetMapping("/getProcessInformation")
      public AjaxResult getProcessInformation(){
-        if(SecurityUtils.getUsername().equals("huaxian")){
+        if(SecurityUtils.getTenantId().equals("166")){
             //查询加弹计划
             int i1 = detailsOfTheRefuelingPlanService.selectDetailsOfTheRefuelingPlanListCount();
             int i2 = detailsOfTheRefuelingPlanSpinningService.selectDetailsOfTheRefuelingPlanSpinningListCount();
@@ -134,7 +134,7 @@ public class StatisticsController {
      */
     @GetMapping("/getRawMaterial")
     public AjaxResult getRawMaterial(){
-        if(SecurityUtils.getUsername().equals("huaxian")){
+        if(SecurityUtils.getTenantId().equals("166")){
             //总库存数量
             int i1 = materialInventoryService.selectMaterialInventoryListSum();
             //出库数量

zkqy-business/src/main/java/com/zkqy/business/entity/MobilePageData.java

@@ -24,56 +24,50 @@ public class MobilePageData extends BaseEntity
 
     /** 模版json */
     @Excel(name = "模版json")
-    private String templateJson;
+    private String pageJson;
 
-    /** 组件数据 */
-    @Excel(name = "组件数据")
-    private String component;
+    @Excel
+    private  String isIndex;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
+    public String getIsIndex() {
+        return isIndex;
+    }
+
+    public void setIsIndex(String isIndex) {
+        this.isIndex = isIndex;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setName(String name) 
-    {
-        this.name = name;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
-    public void setTemplateJson(String templateJson) 
-    {
-        this.templateJson = templateJson;
-    }
 
-    public String getTemplateJson() 
-    {
-        return templateJson;
+    public void setName(String name) {
+        this.name = name;
     }
-    public void setComponent(String component) 
-    {
-        this.component = component;
+
+    public String getPageJson() {
+        return pageJson;
     }
 
-    public String getComponent() 
-    {
-        return component;
+    public void setPageJson(String pageJson) {
+        this.pageJson = pageJson;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("templateJson", getTemplateJson())
-            .append("component", getComponent())
-            .toString();
+        return "MobilePageData{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", pageJson='" + pageJson + '\'' +
+                ", isIndex='" + isIndex + '\'' +
+                '}';
     }
 }

zkqy-business/src/main/resources/mapper/dragmapper/MobilePageDataMapper.xml

@@ -7,20 +7,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zkqy.business.entity.MobilePageData" id="MobilePageDataResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
-        <result property="templateJson"    column="templateJson"    />
-        <result property="component"    column="component"    />
+        <result property="pageJson"    column="pageJson"    />
     </resultMap>
 
     <sql id="selectMobilePageDataVo">
-        select id, name, templateJson, component from {DBNAME}.mobile_page_data
+        select id, name, pageJson from {DBNAME}.mobile_page_data
     </sql>
 
     <select id="selectMobilePageDataList" parameterType="com.zkqy.business.entity.MobilePageData" resultMap="MobilePageDataResult">
         <include refid="selectMobilePageDataVo"/>
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="templateJson != null  and templateJson != ''"> and templateJson = #{templateJson}</if>
-            <if test="component != null  and component != ''"> and component = #{component}</if>
+            <if test="pageJson != null  and pageJson != ''"> and pageJson = #{pageJson}</if>
         </where>
     </select>
     
@@ -33,13 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into mobile_page_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
-            <if test="templateJson != null">templateJson,</if>
-            <if test="component != null">component,</if>
+            <if test="pageJson != null">pageJson,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
-            <if test="templateJson != null">#{templateJson},</if>
-            <if test="component != null">#{component},</if>
+            <if test="pageJson != null">#{pageJson},</if>
          </trim>
     </insert>
 
@@ -47,8 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update mobile_page_data
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
-            <if test="templateJson != null">templateJson = #{templateJson},</if>
-            <if test="component != null">component = #{component},</if>
+            <if test="pageJson != null">pageJson = #{pageJson},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -74,6 +74,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
             }
             saleProducts.setOnBoardState(item.getPlanStatus()); //产品状态
             saleProducts.setLotNumber(item.getCurrentLotNumber());//批号
+            saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
             saleProductsList.add(saleProducts);
         });
         //更新产线

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

@@ -196,6 +196,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         }
         saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlanSpinning.getSalesmanId());//合同号
         saleProducts.setOnBoardState(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//更新上机状态
+        saleProducts.setProductNumber(Double.valueOf(detailsOfTheRefuelingPlanSpinning.getNumber()));//数量
         //修改产品上机状态
         saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanSpinningMapper.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
@@ -247,6 +248,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                 item.setPlanStatus("3");
             }
             saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
+            saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
             saleProductsList.add(saleProducts);
         });
         //更新产线

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

@@ -17,10 +17,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planStatus"    column="plan_status"    />
         <result property="number"    column="number"    />
         <result property="remark"    column="remark"    />
-        <result property="createbyId"    column="createby_id"    />
-        <result property="createbyName"    column="createby_name"    />
-        <result property="updatebyId"    column="updateby_id"    />
-        <result property="updatebyName"    column="updateby_name"    />
+        <result property="createbyId"    column="create_by_id"    />
+        <result property="createbyName"    column="create_by"    />
+        <result property="updatebyId"    column="update_by_id"    />
+        <result property="updatebyName"    column="update_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="productId"    column="product_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDetailsOfTheRefuelingPlanSpinningVo">
-        select id, timestamp_random_code, machine_id, production_digit, current_color_code, current_specification, current_lot_number, start_time, planned_end_time, plan_status, number, remark, createby_id, createby_name, updateby_id, updateby_name, create_time, update_time, product_id, salesman_id from {DBNAME}.details_of_the_refueling_plan_spinning
+        select id, timestamp_random_code, machine_id, production_digit, current_color_code, current_specification, current_lot_number, start_time, planned_end_time, plan_status, number, remark, create_by_id, create_by, update_by, update_by, create_time, update_time, product_id, salesman_id from {DBNAME}.details_of_the_refueling_plan_spinning
     </sql>
 
     <select id="selectDetailsOfTheRefuelingPlanSpinningList" parameterType="com.zkqy.business.domain.DetailsOfTheRefuelingPlanSpinning" resultMap="DetailsOfTheRefuelingPlanSpinningResult">
@@ -44,12 +44,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="plannedEndTime != null  and plannedEndTime != ''"> and planned_end_time = #{plannedEndTime}</if>
             <if test="planStatus != null  and planStatus != ''"> and plan_status = #{planStatus}</if>
             <if test="number != null  and number != ''"> and number = #{number}</if>
-            <if test="createbyId != null  and createbyId != ''"> and createby_id = #{createbyId}</if>
-            <if test="createbyName != null  and createbyName != ''"> and createby_name like concat('%', #{createbyName}, '%')</if>
-            <if test="updatebyId != null  and updatebyId != ''"> and updateby_id = #{updatebyId}</if>
-            <if test="updatebyName != null  and updatebyName != ''"> and updateby_name like concat('%', #{updatebyName}, '%')</if>
+            <if test="createbyId != null  and createbyId != ''"> and create_by_id = #{createbyId}</if>
+            <if test="createbyName != null  and createbyName != ''"> and create_by like concat('%', #{createbyName}, '%')</if>
+            <if test="updatebyId != null  and updatebyId != ''"> and update_by_id = #{updatebyId}</if>
+            <if test="updatebyName != null  and updatebyName != ''"> and update_by like concat('%', #{updatebyName}, '%')</if>
             <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
             <if test="salesmanId != null  and salesmanId != ''"> and salesman_id = #{salesmanId}</if>
+            and plan_status != 3
         </where>
     </select>
     
@@ -73,12 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time,</if>
             <if test="plannedEndTime != null">planned_end_time,</if>
             <if test="planStatus != null">plan_status,</if>
-            <if test="number != null">number,</if>
+            <if test="number != null">`number`,</if>
             <if test="remark != null">remark,</if>
-            <if test="createbyId != null">createby_id,</if>
-            <if test="createbyName != null">createby_name,</if>
-            <if test="updatebyId != null">updateby_id,</if>
-            <if test="updatebyName != null">updateby_name,</if>
+            <if test="createbyId != null">create_by_id,</if>
+            <if test="createbyName != null">create_by,</if>
+            <if test="updatebyId != null">update_by_id,</if>
+            <if test="updatebyName != null">update_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="productId != null">product_id,</if>
@@ -119,9 +120,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="plannedEndTime != null">planned_end_time = #{plannedEndTime},</if>
             <if test="planStatus != null">plan_status = #{planStatus},</if>
-            <if test="number != null">number = #{number},</if>
+            <if test="number != null">`number` = #{number},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="createbyId != null">createby_id = #{createbyId},</if>
+            <if test="createbyId != null">create_by_id = #{createbyId},</if>
             <if test="createbyName != null">createby_name = #{createbyName},</if>
             <if test="updatebyId != null">updateby_id = #{updatebyId},</if>
             <if test="updatebyName != null">updateby_name = #{updatebyName},</if>

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

@@ -263,7 +263,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <set>
                 production_line_no=#{item.productionLineNo},
                 lot_number=#{item.lotNumber},
-                on_board_state=#{item.onBoardState}
+                on_board_state=#{item.onBoardState},
+                product_number=#{item.productNumber}
             </set>
             where id = #{item.id}
         </foreach>

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/WrappingNode.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PreDestroy;
+import java.util.List;
 
 /**
  * 化纤包装-正常节点
@@ -35,8 +36,75 @@ public class WrappingNode implements IRunBPMService {
         commonEntity.getBasicMap().put("tableName","sale_products");
         commonEntity.getConditionMap().put("id",id);
         commonEntity.getCommMap().put("status","6");
+        commonEntity.getCommMap().put("on_board_state","3");
         commonService.edit(commonEntity);
-
+        //停止产线
+        CommonEntity commonEntity2 = new CommonEntity();
+        //查询销售产品信息
+        commonEntity2.getBasicMap().put("tableName","sale_products");
+        commonEntity2.getQueryMap().put("id",id);
+        List<CommonEntity> commonEntities = commonService.selectList(commonEntity2);
+        //找到销售的产品信息
+        if(commonEntities!=null&&commonEntities.size()>0){
+            String productionLineNo = commonEntities.get(0).getResultMap().get("productionLineNo").toString();
+            //查询这个产线属于哪个车间的---停止产线
+            CommonEntity commonEntity3 = new CommonEntity();
+            //查询这个产线属于哪个车间的
+            commonEntity3.getBasicMap().put("tableName","production_line");
+            commonEntity3.getQueryMap().put("production_line_no",productionLineNo);
+            List<CommonEntity> commonEntities3 = commonService.selectList(commonEntity3);
+            if(commonEntities3!=null&&commonEntities3.size()>0){
+                //产线信息
+                CommonEntity common = commonEntities3.get(0);
+                //部门信息
+                String productionLineDepartment = common.getResultMap().get("productionLineDepartment").toString();
+                //等于加弹部的处理逻辑
+                if("加弹部".equals(productionLineDepartment)){
+                    //销售产品信息
+                    CommonEntity common1 = commonEntities.get(0);
+                    String productNo = common1.getResultMap().get("productNo").toString();
+                    //查询产品信息
+                    CommonEntity commonEntity4 = new CommonEntity();
+                    //查询这个产线属于哪个车间的
+                    commonEntity4.getBasicMap().put("tableName","production");
+                    commonEntity4.getQueryMap().put("product_no",productNo);
+                    List<CommonEntity> commonEntities4 = commonService.selectList(commonEntity4);
+                    if(commonEntities4!=null&&commonEntities4.size()>0){
+                        CommonEntity common2 = commonEntities4.get(0);
+                        String productId = common2.getResultMap().get("id").toString();
+                        //停止产线,
+                        CommonEntity commonEntity5 = new CommonEntity();
+                        commonEntity5.getBasicMap().put("tableName","details_of_the_refueling_plan");
+                        commonEntity5.getQueryMap().put("product_id",productId);
+                        commonEntity5.getQueryMap().put("machine_id",productionLineNo);
+                        commonEntity5.getCommMap().put("plan_status","3");
+                        commonService.edit(commonEntity5);
+                    }
+                //非加弹部，翻框和络筒的处理逻辑
+                }else {
+                    //销售产品信息
+                    CommonEntity common1 = commonEntities.get(0);
+                    String productNo = common1.getResultMap().get("productNo").toString();
+                    //查询产品信息
+                    CommonEntity commonEntity4 = new CommonEntity();
+                    //查询这个产线属于哪个车间的
+                    commonEntity4.getBasicMap().put("tableName","production");
+                    commonEntity4.getQueryMap().put("product_no",productNo);
+                    List<CommonEntity> commonEntities4 = commonService.selectList(commonEntity4);
+                    if(commonEntities4!=null&&commonEntities4.size()>0){
+                        CommonEntity common2 = commonEntities4.get(0);
+                        String productId = common2.getResultMap().get("id").toString();
+                        //停止产线,
+                        CommonEntity commonEntity5 = new CommonEntity();
+                        commonEntity5.getBasicMap().put("tableName","details_of_the_refueling_plan_spinning");
+                        commonEntity5.getQueryMap().put("product_id",productId);
+                        commonEntity5.getQueryMap().put("machine_id",productionLineNo);
+                        commonEntity5.getCommMap().put("plan_status","3");
+                        commonService.edit(commonEntity5);
+                    }
+                }
+            }
+        }
         return AjaxResult.success();
     }
 

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

@@ -89,7 +89,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -111,7 +111,7 @@
             </el-table-column>
             <el-table-column prop="planStatus" label="计划状态" header-align="center" align="center" width="100px">
               <template v-slot:default="scope">
-                <el-select  v-model="scope.row.planStatus" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select  v-model="scope.row.planStatus" placeholder="计划状态" >
                   <el-option v-for="stateItem in stateList0" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
               </template>
@@ -189,7 +189,12 @@
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
-
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
+              <template v-slot:default="scope">
+                <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <span v-else>{{ scope.row.number }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="startTime" label="上机时间" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.startTime" placeholder="请输入上机时间" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
@@ -405,6 +410,8 @@ export default {
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
       row.salesmanId=this.product.saleOrderNo;
+      //数量
+      row.number=this.product.productNumber;
     },
     // 新增计划产品信息
     handleAddPlan(row) {
@@ -429,6 +436,7 @@ export default {
       this.isEditLine = true;
       //找到当前行的编辑索引
       var rowIndex = this.tableData2.indexOf(row);
+      console.log(rowIndex)
       if (this.lastEditLine != 0 &&
         this.editingRowIndex !== rowIndex &&
         this.editingRowIndex !== -1 &&
@@ -492,6 +500,7 @@ export default {
         currentSpecification: '',
         currentLotNumber: '',
         productionDigit: '',
+        number:'',
         startTime: '',
         plannedEndTime:'',
         planStatus:0,

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

@@ -89,7 +89,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -197,7 +197,12 @@
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
-
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
+              <template v-slot:default="scope">
+                <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <span v-else>{{ scope.row.number }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="startTime" label="上机时间" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.startTime" placeholder="请输入上机时间" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
@@ -214,19 +219,19 @@
             <el-table-column prop="planStatus" label="计划状态" header-align="center" align="center" width="100px">
               <template v-slot:default="scope">
                 <!--上机变停机待机-->
-                <el-select v-if="scope.row.planStatus==1" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==1" v-model="scope.row.planStatus" placeholder="计划状态" >
                   <el-option v-for="stateItem in stateList1" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--待机可以上机-->
-                <el-select v-if="scope.row.planStatus==0" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==0" v-model="scope.row.planStatus" placeholder="计划状态" >
                   <el-option v-for="stateItem in stateList0" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--停机变上机-->
-                <el-select v-if="scope.row.planStatus==2" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==2" v-model="scope.row.planStatus" placeholder="计划状态">
                   <el-option v-for="stateItem in stateList2" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--已完成-->
-                <el-select v-if="scope.row.planStatus==3" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==3" v-model="scope.row.planStatus" placeholder="计划状态" >
                   <el-option v-for="stateItem in stateList3" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
               </template>
@@ -410,6 +415,8 @@ export default {
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
       row.salesmanId=this.product.saleOrderNo;
+      //数量
+      row.number=this.product.productNumber;
     },
     // 新增计划产品信息
     handleAddPlan(row) {

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

@@ -220,7 +220,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -382,7 +382,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -498,7 +498,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -956,7 +956,9 @@ export default {
     getProductsInfo() {
       getProductsInfo().then((response) => {
         this.productsInfo = response.data;
+        // productNumber
         this.productsInfo.forEach(item => {
+          // this.productsInfo=productNumber
           item.productName = item.productName+"—"+item.materieEncoding+item.materieColorNumber
         });
       })
@@ -965,6 +967,7 @@ export default {
     selectedChangeDate(row,selectedProduct) {
       //选择的那个销售产品
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
+
       this.form.product=selectedProduct;
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
@@ -989,6 +992,9 @@ export default {
       row.currentSpecification= this.product.productSpecifications;
       //销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
       row.salesmanId=this.product.saleOrderNo;
+      //数量
+      row.number=this.product.productNumber;
+      // console.log(this.product,'ddddddddddddddd')
     },
     // 新增计划产品信息
     handleAddPlan(row) {

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

@@ -89,7 +89,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="djNumber" label="数量" header-align="center" align="center">
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.number }}</span>
@@ -111,7 +111,7 @@
             </el-table-column>
             <el-table-column prop="planStatus" label="计划状态" header-align="center" align="center" width="100px">
               <template v-slot:default="scope">
-                <el-select  v-model="scope.row.planStatus" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select  v-model="scope.row.planStatus" placeholder="请选择计划状态" >
                   <el-option v-for="stateItem in stateList0" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
               </template>
@@ -197,7 +197,12 @@
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
-
+            <el-table-column prop="number" label="数量" header-align="center" align="center">
+              <template v-slot:default="scope">
+                <el-input v-if="scope.row.isEditing" v-model="scope.row.number" placeholder="请输入数量" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <span v-else>{{ scope.row.number }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="startTime" label="上机时间" header-align="center" align="center">
               <template v-slot:default="scope">
                 <el-input v-if="scope.row.isEditing" v-model="scope.row.startTime" placeholder="请输入上机时间" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
@@ -214,19 +219,19 @@
             <el-table-column prop="planStatus" label="计划状态" header-align="center" align="center" width="100px">
               <template v-slot:default="scope">
                 <!--上机变停机待机-->
-                <el-select v-if="scope.row.planStatus==1" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==1" v-model="scope.row.planStatus" placeholder="计划状态">
                   <el-option v-for="stateItem in stateList1" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--待机可以上机-->
-                <el-select v-if="scope.row.planStatus==0" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==0" v-model="scope.row.planStatus" placeholder="计划状态">
                   <el-option v-for="stateItem in stateList0" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--停机变上机-->
-                <el-select v-if="scope.row.planStatus==2" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==2" v-model="scope.row.planStatus" placeholder="计划状态" >
                   <el-option v-for="stateItem in stateList2" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
                 <!--已完成-->
-                <el-select v-if="scope.row.planStatus==3" v-model="scope.row.planStatus" placeholder="计划状态" @change="selectedSalesmanItem(scope.row,scope.row.planStatus)">
+                <el-select v-if="scope.row.planStatus==3" v-model="scope.row.planStatus" placeholder="计划状态">
                   <el-option v-for="stateItem in stateList3" :key="stateItem.id" :label="stateItem.name" :value="stateItem.id" ></el-option>
                 </el-select>
               </template>
@@ -408,6 +413,8 @@ export default {
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
       row.salesmanId=this.product.saleOrderNo;
+      //数量
+      row.number=this.product.productNumber;
     },
     // 新增计划产品信息
     handleAddPlan(row) {