فهرست منبع

feat:改销售产品的上机状态

hmc 1 سال پیش
والد
کامیت
1afc134261

+ 12 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/domain/SaleProducts.java

@@ -97,6 +97,18 @@ public class SaleProducts extends BaseEntity
     @Excel(name = "批号")
     private String lotNumber;
 
+    @Excel
+    private  String  onBoardState;
+
+
+    public String getOnBoardState() {
+        return onBoardState;
+    }
+
+
+    public void setOnBoardState(String onBoardState) {
+        this.onBoardState = onBoardState;
+    }
 
     public String getLotNumber() {
         return lotNumber;

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

@@ -55,6 +55,11 @@ public interface SaleProductsMapper
      */
     public int updateSaleProducts(SaleProducts saleProducts);
 
+    /**
+     * 根据销售单号改产品状态
+     * @return
+     */
+    public int  updateSaleProductsBySaleOrderNo(SaleProducts saleProducts);
     /**
      * 批量修改线号
      * @param saleProducts

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

@@ -52,26 +52,31 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
     @Transactional
     public int insertAmmunitionPlanInformationIntermediateTable(AmmunitionPlanInformationIntermediateTable ammunitionPlanInformationIntermediateTable)
     {
-//        List<SaleOrder> saleOrderList=new ArrayList<>();
-//        List<SaleProducts> saleProductsList=new ArrayList<>();
-//        //改批号,和产线号
-//        ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans().forEach(item->{
-//            //改掉某个订单的批号
-//            SaleOrder saleOrder = new SaleOrder();
-//            //当初计划要存,业务员id,后期存的内容是订单号
-//            saleOrder.setSaleNo(item.getSalesmanId().toString());
-//            saleOrder.setLotNumber(item.getCurrentLotNumber().toString());
-//            saleOrderList.add(saleOrder);
-//            //改产品的线号
-//            SaleProducts saleProducts=new SaleProducts();
-//            saleProducts.setId(Long.valueOf(item.getProductId()));
-//            saleProducts.setProductionLineNo(item.getMachineId());
-//            saleProductsList.add(saleProducts);
-//        });
-//        //更新批号
-//        int i1 = saleOrderMapper.updateSaleOrderBatch(saleOrderList);
-//        //更新产线
-//        int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
+        List<SaleProducts> saleProductsList=new ArrayList<>();
+        //改批号,和产线号
+        ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans().forEach(item->{
+            //改产品的线号
+            SaleProducts saleProducts=new SaleProducts();
+            saleProducts.setId(Long.valueOf(item.getProductId()));
+            saleProducts.setProductionLineNo(item.getMachineId());
+            if(item.getPlanStatus().equals("待机")){
+               item.setPlanStatus("0");
+            }
+            if(item.getPlanStatus().equals("上机")){
+                item.setPlanStatus("1");
+            }
+            if(item.getPlanStatus().equals("停机")){
+                item.setPlanStatus("2");
+            }
+            if(item.getPlanStatus().equals("完成")){
+                item.setPlanStatus("3");
+            }
+            saleProducts.setOnBoardState(item.getPlanStatus()); //产品状态
+            saleProducts.setLotNumber(item.getCurrentLotNumber());//批号
+            saleProductsList.add(saleProducts);
+        });
+        //更新产线
+        int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
         //插入计划数据
         int i3 = detailsOfTheRefuelingPlanMapper.insertBatchDetailsOfTheRefuelingPlan(ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans());
         return i3;

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

@@ -109,6 +109,23 @@ public class DetailsOfTheRefuelingPlanServiceImpl implements IDetailsOfTheRefuel
          *         //改这个产品用的那个产线
          *productsMapper.updateSaleProducts(saleProducts);
          */
+        SaleProducts saleProducts=new SaleProducts();
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("待机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("0");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("上机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("1");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("停机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("2");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("完成")){
+            detailsOfTheRefuelingPlan.setPlanStatus("3");
+        }
+        saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlan.getSalesmanId());//合同号
+        saleProducts.setOnBoardState(detailsOfTheRefuelingPlan.getPlanStatus());//更新上机状态
+        //修改产品上机状态
+        productsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlan(detailsOfTheRefuelingPlan);
     }
 

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

@@ -176,6 +176,23 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
 //        saleProducts.setProductionLineNo(detailsOfTheRefuelingPlanSpinning.getMachineId());//产线编号
 //        //改这个产品用的那个产线
 //        saleProductsMapper.updateSaleProducts(saleProducts);
+        SaleProducts saleProducts=new SaleProducts();
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("待机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("0");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("上机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("1");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("停机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("2");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("完成")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("3");
+        }
+        saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlanSpinning.getSalesmanId());//合同号
+        saleProducts.setOnBoardState(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//更新上机状态
+        //修改产品上机状态
+        saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanSpinningMapper.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
     }
 
@@ -204,25 +221,29 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
     @Override
     public int insertDetailsOfTheRefuelingPlanSpinningBatch(List<DetailsOfTheRefuelingPlanSpinning> detailsOfTheRefuelingPlanSpinning) {
         //批量插入修改产线号和批号
-        List<SaleOrder> saleOrderList=new ArrayList<>();
         List<SaleProducts> saleProductsList=new ArrayList<>();
         //改批号,和产线号
         detailsOfTheRefuelingPlanSpinning.forEach(item->{
-            //改掉某个订单的批号
-            SaleOrder saleOrder = new SaleOrder();
-            //当初计划要存,业务员id,后期存的内容是订单号
-            saleOrder.setSaleNo(item.getSalesmanId().toString());//订单号
-            saleOrder.setLotNumber(item.getCurrentLotNumber().toString());//批号
-            saleOrderList.add(saleOrder);
             //改产品的线号,批号
             SaleProducts saleProducts=new SaleProducts();
             saleProducts.setId(Long.valueOf(item.getProductId()));
             saleProducts.setProductionLineNo(item.getMachineId());
             saleProducts.setLotNumber(item.getCurrentLotNumber().toString());//批号
+            if(item.getPlanStatus().equals("待机")){
+                item.setPlanStatus("0");
+            }
+            if(item.getPlanStatus().equals("上机")){
+                item.setPlanStatus("1");
+            }
+            if(item.getPlanStatus().equals("停机")){
+                item.setPlanStatus("2");
+            }
+            if(item.getPlanStatus().equals("完成")){
+                item.setPlanStatus("3");
+            }
+            saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
             saleProductsList.add(saleProducts);
         });
-        //更新批号
-        int i1 = saleOrderMapper.updateSaleOrderBatch(saleOrderList);
         //更新产线
         int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
         return detailsOfTheRefuelingPlanSpinningMapper.insertBatchDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);

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

@@ -216,6 +216,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateSaleProductsBySaleOrderNo" parameterType="com.zkqy.business.domain.SaleProducts">
+        update {DBNAME}.sale_products
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="saleProductNo != null">sale_product_no = #{saleProductNo},</if>
+            <if test="productNo != null">product_no = #{productNo},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="productNumber != null">product_number = #{productNumber},</if>
+            <if test="productWeight != null">product_weight = #{productWeight},</if>
+            <if test="productUnitPrice != null">product_unit_price = #{productUnitPrice},</if>
+            <if test="productAmounts != null">product_amounts = #{productAmounts},</if>
+            <if test="productNotes != null">product_notes = #{productNotes},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createById != null">create_by_id = #{createById},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateById != null">update_by_id = #{updateById},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
+            <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
+            <if test="processKey != null">process_key = #{processKey},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="productionLineNo != null">production_line_no = #{productionLineNo},</if>
+            <if test="sliceType != null">slice_type = #{sliceType},</if>
+            <if test="colourNumber != null">colour_number = #{colourNumber},</if>
+            <if test="onBoardState != null">on_board_state = #{onBoardState},</if>
+        </trim>
+        where sale_order_no = #{saleOrderNo}
+    </update>
+
     <delete id="deleteSaleProductsById" parameterType="Long">
         delete from sale_products where id = #{id}
     </delete>
@@ -231,7 +262,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update {DBNAME}.sale_products
             <set>
                 production_line_no=#{item.productionLineNo},
-                lot_number=#{item.lotNumber}
+                lot_number=#{item.lotNumber},
+                on_board_state=#{item.onBoardState}
             </set>
             where id = #{item.id}
         </foreach>

+ 14 - 5
zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -178,14 +178,14 @@
             <el-table-column prop="currentSpecification" label="规格" header-align="center" align="center">
               <template v-slot:default="scope">
                 <!-- 如果当前行正在编辑,则显示输入框 -->
-                <el-input v-if="scope.row.isEditing" v-model="scope.row.currentSpecification" placeholder="请输入规格" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="false" v-model="scope.row.currentSpecification" placeholder="请输入规格" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <!-- 否则显示普通文本 -->
                 <span v-else>{{ scope.row.currentSpecification }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -223,7 +223,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -253,6 +253,8 @@ import {
 export default {
   data() {
     return {
+      //
+      isDisabled:true,
       //选中的是那个车间
       tableData:[],
       form: {
@@ -371,6 +373,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用,没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号(以前打算存的是业务员信息后来存的是销售单编号)

+ 15 - 7
zkqy-ui/src/views/orderMange/planTable/fankuang.vue

@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -178,7 +178,7 @@
             <el-table-column prop="weishu" label="位数" header-align="center" align="center">
               <template v-slot:default="scope">
                 <!-- 如果当前行正在编辑,则显示输入框 -->
-                <el-input v-if="scope.row.isEditing"  disabled="disabled"  v-model="scope.row.currentColorCode" placeholder="请输入色号" @blur.stop.prevent="handleInputBlur(scope.row)" ></el-input>
+                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentColorCode" placeholder="请输入色号" @blur.stop.prevent="handleInputBlur(scope.row)" ></el-input>
                 <!-- 否则显示普通文本 -->
                 <span v-else>{{ scope.row.currentColorCode }}</span>
               </template>
@@ -193,7 +193,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -231,7 +231,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -260,6 +260,8 @@ import {
 export default {
   data() {
     return {
+      //
+      isDisabled:true,
       //选中的是那个车间
       tableData:[],
       form: {
@@ -365,8 +367,7 @@ export default {
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       //选择的那个产品
       this.form.product=selectedProduct;
-      //批次
-      row.currentLotNumber=this.product.lotNumber;
+
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -379,6 +380,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用,没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号(以前打算存的是业务员信息后来存的是销售单编号)

+ 12 - 4
zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -93,7 +93,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号"  header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"  disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing"  :disabled="isDisabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -364,7 +364,8 @@
 
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -564,6 +565,7 @@ export default {
       //选中的是那个车间
       selectedWorkshop:"南车间",
       tableData:[],
+      isDisabled:true,
       form: {
         product:"",
       },
@@ -771,7 +773,6 @@ export default {
       //选择的那个销售产品
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       this.form.product=selectedProduct;
-      row.currentLotNumber=this.product.lotNumber;
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -784,9 +785,16 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用,没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
-      //合同号--销售单编号(以前打算存的是业务员信息后来存的是销售单编号)
+      //销售单编号(以前打算存的是业务员信息后来存的是销售单编号)
       row.salesmanId=this.product.saleOrderNo;
     },
     // 新增计划产品信息

+ 12 - 5
zkqy-ui/src/views/orderMange/planTable/luotong.vue

@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -193,7 +193,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -231,7 +231,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -262,6 +262,8 @@ export default {
     return {
       //选中的是那个车间
       tableData:[],
+      //默认是禁用
+      isDisabled:true,
       form: {
         product:"",
       },
@@ -364,8 +366,6 @@ export default {
       //选择的那个销售产品
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       this.form.product=selectedProduct;
-      //批次
-      row.currentLotNumber=this.product.lotNumber;
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -378,6 +378,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用,没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号(以前打算存的是业务员信息后来存的是销售单编号)

+ 2 - 1
zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -871,7 +871,8 @@ export default {
       this.particularsOfSalesNote.purchaseLotNumber=row.purchaseLotNumber
       this.particularsOfSalesNote.purchaseTiem=row.purchaseCreateTime
       this.viewPurchaseOrderDetailsShow=true;
-      getPurchaseInfo({"purchaseId":row.purchaseId}).then(resp=>{
+      // console.log(row,"行数据");
+      getPurchaseInfo({"purchaseId":row.purchaseSerialNumber}).then(resp=>{
         this.purchaseInfo=resp.data
         console.log(this.purchaseInfo)
       })