diff --git a/src/components/bad-type/bad-type.vue b/src/components/bad-type/bad-type.vue
index 821fecd..3bd1955 100644
--- a/src/components/bad-type/bad-type.vue
+++ b/src/components/bad-type/bad-type.vue
@@ -9,6 +9,8 @@
 </template>
 
 <script lang="ts">
+import model from './model';
+import { session } from '@/store/modules/session';
 /**
  * 选择组件
  * @property {Array} options 选择数组
@@ -21,11 +23,18 @@
  * @event {Function} sure 确认事件
  * @example <jPicker :disabled="false" class="cont" @sure="bindPickerChange($event,'TYPE')" showKey="Name" valKey="Value" :val="CurrentType" :options="FilterArray" />
  */
+
 export default {
+  components: {
+    // #ifdef H5
+    // #endif
+  },
   name: 'badType',
   data() {
     return {
+      model: model,
       tagslist: [],
+      selectList1: {},
       //moren: this.moren,
       isshow: false,
       tagsvalue: '111',
@@ -39,6 +48,7 @@ export default {
       mobile: '',
       itemindex: '',
       tagslistcopy: [],
+      moren1: '接受质量限',
     };
   },
   props: ['options', 'moren', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus'],
@@ -61,6 +71,19 @@ export default {
     },
   },
   methods: {
+    async selectProductlocCode3(e: any) {
+      this.selectList1 = e.pickerName;
+      let query = {
+        factoryCode: session.PoolName,
+        checkManCode: session.userName,
+        checkStatus: 0,
+        checkType: this.selectList.value,
+        checkLoc: this.selectList1.value,
+      };
+      this.getDefectListPDA();
+      await this.model.getCheckTaskListall(query);
+      this.list = this.model.CheckTaskListall;
+    },
     open(item, index) {
       console.log(item, index);
       this.itemindex = index;
diff --git a/src/components/bad-type/model.ts b/src/components/bad-type/model.ts
new file mode 100644
index 0000000..e0883ab
--- /dev/null
+++ b/src/components/bad-type/model.ts
@@ -0,0 +1,32 @@
+import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+@Module({
+  namespaced: true,
+  dynamic: true,
+  store,
+  name: 'page.raw.Materialinspection',
+})
+export class Materialinspection extends VuexModule {
+  locList2: any = [];
+  materialtypeList: any = '';
+  @MutationAction
+  async getmaterialTypePDA() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'material_type_oa',
+      },
+    });
+    console.log(result);
+    const materialtypeList: [] = result;
+    const locList2 = materialtypeList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList2 };
+  }
+}
+
+export default getModule(Materialinspection);
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 080dbb7..995610d 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -250,9 +250,15 @@
           <u-input :border="true" v-model="tagsvalue" :focus="isfocus" style="overflow: hidden" />
         </div>
         <div>
-          <u-button style="width: 100px; height: 35px; margin-left: 5px" @click="ontagsadd" size="mini" type="primary">确认</u-button>
+          <u-button style="width: 100px; height: 35px; margin-left: 5px" @click="ontagsadd" size="mini" type="primary">测量值增加</u-button>
         </div>
       </div>
+      <div class="upload-name" v-show="isgetAutoJudge">
+        <jPicker style="border: 1px solid #dcdfe6; padding: 8px 18px" sureColor="#ff0000" :moren="moren7" @bindpicker="selectProductlocCode6" showKey="label" valKey="value" :val="selectList4.value" :options="model.locList4" />
+      </div>
+      <div class="upload-name" v-show="isgetAutoJudge">
+        <jPicker style="border: 1px solid #dcdfe6; padding: 8px 18px" sureColor="#ff0000" :moren="moren8" @bindpicker="selectProductlocCode7" showKey="label" valKey="value" :val="selectList5.value" :options="model.locList5" />
+      </div>
     </u-modal>
     <badtype sureColor="#ff0000" ref="babtype" :showtype="isshowtype" @bindtypelist="selectbabTypelist" showKey="label" valKey="value" :options="model.locList1" />
     <u-toast ref="uToast" />
@@ -281,6 +287,8 @@ export default class PurchaseWHSRM extends BasePage {
   moren4 = '请选择检验位置';
   moren5 = '请选择来料类别';
   moren6 = '请选择物料来源';
+  moren7 = '请选择接受质量限';
+  moren8 = '请选择检测水平';
   list: any = [];
   show = false;
   showselect = false;
@@ -331,6 +339,9 @@ export default class PurchaseWHSRM extends BasePage {
   ];
   selectList: any = {};
   selectList1: any = {};
+  selectList2: any = {};
+  selectList4: any = {};
+  selectList5: any = {};
   defectCodeList: any = {};
   // remove: any = {};
   // async onReady() {
@@ -370,6 +381,7 @@ export default class PurchaseWHSRM extends BasePage {
   isvalue2 = false;
   isvalue3 = false;
   isquality = false;
+  isgetAutoJudge = false;
   isfocus = false;
   isshow1 = false;
   isshow2 = false;
@@ -442,6 +454,8 @@ export default class PurchaseWHSRM extends BasePage {
   async getselectlist() {
     await this.model.getCheckType();
     await this.model.getcheckLocList();
+    await this.model.getsampleaqlList();
+    await this.model.getsamplelevelList();
     this.nodelist = this.model.orderNoItemList;
     this.nodelist1 = this.model.orderNoItemList1;
   }
@@ -650,6 +664,14 @@ export default class PurchaseWHSRM extends BasePage {
     this.selectmaterialFromList = e.pickerName;
     this.formdata.materialFrom = this.selectmaterialFromList.value;
   }
+  async selectProductlocCode6(e: any) {
+    this.selectList4 = e.pickerName;
+    this.detaillistceshi[this.equipmentindex[0]].sampleAql = this.selectList4.value;
+  }
+  async selectProductlocCode7(e: any) {
+    this.selectList5 = e.pickerName;
+    this.detaillistceshi[this.equipmentindex[0]].checkLevel = this.selectList5.value;
+  }
   focustype(item, value, index) {
     this.isfocus = false;
     this.$nextTick(() => {
@@ -658,11 +680,25 @@ export default class PurchaseWHSRM extends BasePage {
     (this.$refs.babtype as any).open(item, index);
   }
   focus(item, value, index) {
-    console.log(item, value, index);
+    if (this.detaillistceshi[index].upperDiff == null && this.detaillistceshi[index].downDiff == null) {
+      this.isgetAutoJudge = false;
+    } else {
+      if (this.selectList.value == 'checkTypeLL' || this.selectList.value == 'checkTypeCP') {
+        this.isgetAutoJudge = true;
+      }
+    }
+    console.log(item, value, index, this.isgetAutoJudge, this.detaillistceshi[index].upperDiff == null && this.detaillistceshi[index].downDiff == null, this.detaillistceshi[index].updiff);
     if (this.detaillistceshi[index].actualValue) {
       this.tagslist = JSON.parse(this.detaillistceshi[index].actualValue);
+      console.log(this.detaillistceshi[index], 'sdsaasd');
+      this.selectList4.value = this.detaillistceshi[index].sampleAql;
+      this.selectList5.value = this.detaillistceshi[index].checkLevel;
     } else {
       this.tagslist = [];
+      this.detaillistceshi[index].sampleAql = null;
+      this.detaillistceshi[index].checkLevel = null;
+      // this.selectList4.value = this.detaillistceshi[index].sampleAql;
+      // this.selectList5.value = this.detaillistceshi[index].checkLevel;
     }
     this.isfocus = false;
     this.$nextTick(() => {
@@ -879,21 +915,21 @@ export default class PurchaseWHSRM extends BasePage {
       reason: this.formdata.reason,
     };
     console.log(query, this.formdata);
-    // await this.model.commitCheckTaskList(query);
-    // if (this.model.SubmitCode.code == '200') {
-    //   (this.$refs.uToast as any).show({
-    //     title: '成功',
-    //     type: 'default',
-    //   });
-    //   this.show = false;
-    //   this.getlist();
-    //   this.clear();
-    // } else {
-    //   (this.$refs.uToast as any).show({
-    //     title: '失败',
-    //     type: 'default',
-    //   });
-    // }
+    await this.model.commitCheckTaskList(query);
+    if (this.model.SubmitCode.code == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'default',
+      });
+      this.show = false;
+      this.getlist();
+      this.clear();
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'default',
+      });
+    }
   }
   clear() {
     this.formdata.sampleQuality = null;
@@ -903,12 +939,41 @@ export default class PurchaseWHSRM extends BasePage {
       this.detaillistceshi[this.equipmentindex[0]].actualValue = null;
     } else {
       this.detaillistceshi[this.equipmentindex[0]].actualValue = JSON.stringify(this.tagslist);
+      if (this.isgetAutoJudge) {
+        this.getAutoJudgelist();
+      }
     }
     this.tagsvalue = null;
   }
+  async getAutoJudgelist() {
+    console.log(this.detaillistceshi[this.equipmentindex[0]].actualValue, this.tagslist);
+    let query1 = {
+      factoryCode: session.PoolName,
+      sampleQuality: this.clickitem.quality,
+      checkLevel: this.selectList5.value,
+      sampleAql: this.selectList4.value,
+      actualValues: this.tagslist,
+      upperDiff: this.detaillistceshi[this.equipmentindex[0]].upperDiff,
+      downDiff: this.detaillistceshi[this.equipmentindex[0]].downDiff,
+    };
+    await this.model.getAutoJudge(query1);
+    //     sampleCode:样本量编码
+    // sampleQuality:样本数量
+    // status:是否台格合格N不合格
+    if (this.model.getAutoJudgeList.data) {
+      this.detaillistceshi[this.equipmentindex[0]].status = this.model.getAutoJudgeList.data.status;
+      this.detaillistceshi[this.equipmentindex[0]].sampleCode = this.model.getAutoJudgeList.data.sampleCode;
+      this.detaillistceshi[this.equipmentindex[0]].sampleQuality = this.model.getAutoJudgeList.data.sampleQuality;
+      this.detaillistceshi[this.equipmentindex[0]].sampleAql = this.selectList4.value;
+      this.detaillistceshi[this.equipmentindex[0]].checkLevel = this.selectList5.value;
+    }
+  }
+  // factoryCode:工厂编码sampleQuality： checkLevel:检测水平sampleaq1:接受质量限actualValue:[]实际测量值upperDiff:上限downDiff:下限
   cancel() {
     this.isshow = false;
     this.tagsvalue = null;
+    this.detaillistceshi[this.equipmentindex[0]].sampleAql = null;
+    this.detaillistceshi[this.equipmentindex[0]].checkLevel = null;
   }
   //查询货单关联采购单信息
   // 照片上传
@@ -1405,7 +1470,7 @@ export default class PurchaseWHSRM extends BasePage {
   }
   .modal {
     .upload-name {
-      padding: 10px 20px;
+      padding: 6px 20px;
       display: flex;
       justify-content: space-between;
       .name {
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index fa22b4b..98a4ddf 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -97,6 +97,21 @@ export class Materialinspection extends VuexModule {
     }));
     return { orderNoItemList1, selectList1 };
   }
+  orderNoItemList2: any = [];
+  selectList2: any = [];
+  @MutationAction
+  async getQualitylimit() {
+    const result: any = await http.post(url.lanjuquality.Materialinspection.getcheckLocList, {
+      factoryCode: session.PoolName,
+    });
+    const orderNoItemList2 = result;
+    console.log(result, 'wwwwwww');
+    const selectList2 = result.map((item: any) => ({
+      label: item.defectSubclass,
+      value: item.defectCode,
+    }));
+    return { orderNoItemList2, selectList2 };
+  }
   locList2: any = [];
   materialtypeList: any = '';
   @MutationAction
@@ -133,6 +148,42 @@ export class Materialinspection extends VuexModule {
     }));
     return { locList3 };
   }
+  locList4: any = [];
+  sampleaqlList: any = '';
+  @MutationAction
+  async getsampleaqlList() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'sample_aql',
+      },
+    });
+    console.log(result);
+    const sampleaqlList: [] = result;
+    const locList4 = sampleaqlList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList4 };
+  }
+  locList5: any = [];
+  samplelevelList: any = '';
+  @MutationAction
+  async getsamplelevelList() {
+    const result: any = await http.get(url.lanjuquality.Materialinspection.getDictData, {
+      //loginName: session.loginName,
+      params: {
+        dictType: 'sample_level',
+      },
+    });
+    console.log(result);
+    const samplelevelList: [] = result;
+    const locList5 = samplelevelList.map((item: any) => ({
+      label: item.ymdTypeName,
+      value: item.ymdType,
+    }));
+    return { locList5 };
+  }
   WeightInfoList: any = [];
   @MutationAction
   async getWeightInfo(query: any) {
@@ -143,6 +194,14 @@ export class Materialinspection extends VuexModule {
     const WeightInfoList = result;
     return { WeightInfoList };
   }
+  // 自动判定
+  getAutoJudgeList: any = '';
+  @MutationAction
+  async getAutoJudge(params: any) {
+    const result: any = await http.post(url.lanjuquality.Materialinspection.getAutoJudge, params);
+    const getAutoJudgeList: [] = result;
+    return { getAutoJudgeList };
+  }
 }
 
 export default getModule(Materialinspection);
diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue
index 75ab52a..a4ed218 100644
--- a/src/pages/quality/Records/index.vue
+++ b/src/pages/quality/Records/index.vue
@@ -14,7 +14,7 @@
       <!-- <u-input @blur="onblur()" @focus="onfocus" @click="onclick" :border="true" v-model="selectvalue" placeholder="请选择检验节点" style="overflow: hidden" /> -->
       <!-- </u-form-item> -->
     </u-form>
-    <u-form class="form" ref="form" label-width="180rpx" style="margin-top: 10px">
+    <u-form class="form" ref="form" label-width="180rpx" style="margin-top: 10px" v-show="selectList.value != 'checkTypeLL'">
       <!-- 订单 -->
       <!-- <u-form-item label="检验节点"> -->
       <jPicker sureColor="#ff0000" :moren="moren4" @bindpicker="selectProductlocCode3" showKey="label" valKey="value" :val="selectList1.value" :options="model.selectList1" />
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 34e4ff9..517b6e8 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -126,9 +126,9 @@ export const url = {
       MatReturnWH: {
         into: qianzhuione + '/wms/order/InventoryPlanIssuance',
       },
-      ArrivalRecord:{
+      ArrivalRecord: {
         getArrivalRecord: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistrationreader',
-      }
+      },
     },
     WhiteManagement: {
       WhiteInstorage: {
@@ -238,6 +238,8 @@ export const url = {
       getDictData: qianzhuione + '/quality/qcInterface/getDictData',
       // 自动取数
       getWeightInfo: qianzhuione + '/quality/handCheck/getWeightInfo',
+      // 检验自动判定
+      getAutoJudge: qianzhuione + '/quality/handCheck/getAutoJudge',
     },
     // 历史记录
     Records: {