界面调整

src/api/quality/qcTable.js

@@ -93,3 +93,11 @@ export function getProjectOptionList(checkType) {
 		method: 'get'
 	});
 }
+
+export function getDLTableCPKInfo(query) {
+	return request({
+		url: '/quality/staticTable/getDLTableCPKInfo',
+		method: 'get',
+		params: query
+	});
+}

src/utils/request.js

@@ -105,6 +105,8 @@ service.interceptors.response.use(res => {
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
+    } else if (code === 642) {
+      return res.data
     }else if (code !== 200) {
       Notification.error({ title: msg })
       return Promise.reject('error')

src/views/plan/order/index.vue

@@ -77,9 +77,10 @@
           plain
           icon="el-icon-download"
           size="mini"
+          :disabled="isButtonDisabled"
           @click="handleSyncSAP"
           v-hasPermi="['mes:pro:order:add']"
-        >SAP同步
+        >{{ countdownTime > 0 ? countdownTime + ' 秒后重试SAP同步' : 'SAP同步' }}
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -115,14 +116,14 @@
         >导出
         </el-button>
       </el-col>
-      <!--
+      
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
         :disabled="single"
         v-hasPermi="['mes:pro:order:edit']">辅助排产
         </el-button>
-      </el-col>-->
+      </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -369,7 +370,7 @@
     </el-dialog>
 
     <!-- 拆分模块 -->
-    <el-dialog :title="title" :visible.sync="splitOpen" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="splitOpen" width="1000px">
       <!-- 拆分头pro -->
       <el-table
         border
@@ -503,7 +504,7 @@
       </div>
     </el-dialog>
     <!-- 辅助排产规划 -->
-		<el-dialog :title="titleAutoSplit" :visible.sync="openAutoSplit" width="1000px">
+		<el-dialog :title="titleAutoSplit" :visible.sync="openAutoSplit" width="1000px"  @close="handleClose">
       <el-steps :active="activeSplit" simple>
         <el-step title="工单基本信息" icon="el-icon-edit"></el-step>
         <el-step title="生产线体选择" icon="el-icon-s-tools"></el-step>
@@ -519,6 +520,18 @@
                   </el-date-picker>
               </el-form-item>
             </el-col>
+            
+            <!-- 选择班次 -->
+            <el-col :span="12">
+              <el-form-item size="small" label="选择班次" class="my-select my-first">
+                <el-select v-model="autoSplitform1.shiftId" placeholder="请选择班次">
+                  <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+                            :value="item.shiftId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
           </el-row>
           <el-row>
             <el-col :span="12">
@@ -576,7 +589,7 @@
         <el-table-column width="70" align="center" prop="quantitySplit" label="数量"></el-table-column>
         <el-table-column width="60" label="单位" align="center" prop="unit"/>
         <el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
-        <el-table-column width="70" label="班次" align="center" prop="shiftDesc"/>
+        <el-table-column width="70" label="班次" align="center" prop="shiftDesc" :formatter="shiftFormat"/>
         <el-table-column width="160" align="center" prop="batchCodeList" label="批次号"></el-table-column>
         <el-table-column width="100" align="center" prop="batchNumList" label="批次数量"></el-table-column>
       </el-table>
@@ -730,10 +743,14 @@ export default {
       activeSplit: 0,
       autoSplitform1:{
         productDate:null,
-        sortNo:null
+        sortNo:null,
+        shiftId:null
       },
       autoSplitform2: {lineCodes:[]},
-      lineCodes:[]
+      lineCodes:[],
+      countdownTime: 0,// 倒计时时间
+      isButtonDisabled: false, // 按钮是否禁用
+      countdownInterval: null, // 倒计时定时器
     }
   },
   created() {
@@ -1457,6 +1474,23 @@ export default {
     },
     // 首-SAP同步按钮操作
     handleSyncSAP() {
+
+
+      if (this.countdownTime > 0) return; // 如果已经在倒计时，则不重复启动
+      this.isButtonDisabled = true; // 禁用按钮
+      this.countdownTime = 30; // 设置倒计时时间，例如10秒
+
+      // 使用setInterval进行倒计时
+      this.countdownInterval = setInterval(() => {
+        if (this.countdownTime > 0) {
+          this.countdownTime--;
+        } else {
+          clearInterval(this.countdownInterval); // 清除定时器
+          this.isButtonDisabled = false; // 倒计时结束，启用按钮
+          this.countdownTime = 0; // 重置倒计时时间
+        }
+      }, 1000); // 每秒更新一次
+
       this.loading = true;
       let planDateStart =null;
       let planDateEnd =null;
@@ -1496,13 +1530,20 @@ export default {
 		},
     //排产优先级
 		handleAutoSplit(row) {
-      this.openAutoSplit = true;
       this.autoSplitList = this.orderCodes;
-
+      if(this.autoSplitList[0].status != 'o0'){
-      if(this.autoSplitList[0] == 'o2'){
+          this.$modal.msgError("请选择完全未拆分的订单！");
-          this.$modal.msgError("已经拆分结束！");
+          return
       }
 
+      // 获取班次信息
+      getProShifts().then(response => {
+        this.workShift = response.data;
+        this.autoSplitform1.shiftId = 5;
+      })
+
+      this.openAutoSplit = true;
+
       this.autoSplitform1.productDate = this.autoSplitList[0].planProDate;
       // 获取工艺信息(工艺选最新的)
       getProRoutes(this.autoSplitList[0].prodCode).then(response => {
@@ -1518,7 +1559,12 @@ export default {
       // 获取生产线体列表
       getCanProductLine(this.autoSplitList[0]).then(response => {
         this.lineCodes = response.lineList;
+        if(response.recommendLineList == null){
+          this.$modal.msgError("设备产能达不到订单水平，请调整设备产能或重新审视订单计划数量！");
+          this.cancel();
+        }else{
           this.autoSplitform2.lineCodes = response.recommendLineList;//['XL01','XL02'];
+        }
       })
 
 
@@ -1564,11 +1610,17 @@ export default {
         if (this.activeSplit++ > 2) this.activeSplit = 0;
         //选完线体后的下一步，会进行模拟拆分
         if(this.activeSplit == 2){
-          autoSplitOrder(Object.assign({},this.autoSplitList[0],this.autoSplitform1,this.autoSplitform2)).then(response => {
+          const p = Object.assign({},this.autoSplitList[0],this.autoSplitform1,this.autoSplitform2);
+          debugger
+          autoSplitOrder(p).then(response => {
+            if(response.code == 642){
+              this.$modal.msgError(response.msg);
+              this.cancel();
+            }else{
               this.workerLoading = true // 设置加载状态为true，表示正在加载
               // 获取历史拆分工单信息
-            getWorkOrderListCG(this.autoSplitList[0].id).then(response => {
+              getWorkOrderListCG(this.autoSplitList[0].id).then(res => {
-              var data = response.data
+                var data = res.data
                 this.splitData = data
 
                 this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
@@ -1578,6 +1630,7 @@ export default {
                   this.workerLoading = false // 设置加载状态为false，表示加载完成
                 })
               })
+            }
           });
         }
       },
@@ -1596,7 +1649,20 @@ export default {
           this.openAutoSplit = false;
           this.activeSplit = 0;
         });
+      },
+      handleClose() { 
+        this.cancel();
+      },
+       shiftFormat(row,column){
+        let array = this.workShift;
+        let value = '其他';
+        array.forEach((item) => {
+          if (item.shiftId == row.shiftId) {
+            value = item.shiftDesc
           }
+        })
+        return value;
+      },
   }
 
 }

src/views/plan/workorder/index.vue

@@ -1525,6 +1525,9 @@ export default {
       if (this.queryParams.productDateArray != null) {
         this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
         this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
+      }else{
+        this.queryParams.productDateStart = null;
+        this.queryParams.productDateEnd = null;
       }
       //第一层
       listWorkorderLevel0(this.queryParams).then(response => {

src/views/quality/qcIncome/index.vue

@@ -206,15 +206,15 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcIncome:edit']"
 					>检验</el-button>
-					<!--
+
 					<el-button
 						size="mini"
 						type="text"
-						icon="el-icon-delete"
+						icon="el-icon-magic-stick"
-						@click="handleDelete(scope.row)"
+						@click="handleCheckProjectM(scope.row)"
-						v-hasPermi="['quality:qcIncome:remove']"
+						v-hasPermi="['quality:qcIncome:editM']"
-					>删除</el-button>
+					>审核编辑</el-button>
-					-->
+
 				</template>
 			</el-table-column>
 		</el-table>
@@ -722,6 +722,11 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'material');
 		},
+		//检验项目弹窗(二次编辑)
+		handleCheckProjectM(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(row,'material');
+		},
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;

src/views/quality/qcInventory/index.vue

@@ -9,63 +9,8 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="批次号" prop="incomeBatchNo">
+			
-				<el-input
+			<el-form-item label="任务创建时间" prop="checkTimeArray" label-width="120px">
-					v-model="queryParams.incomeBatchNo"
-					placeholder="请输入库存批次号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="物料号" prop="materialCode">
-				<el-input
-					v-model="queryParams.materialCode"
-					placeholder="请输入物料号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="物料名称" prop="materialName">
-				<el-input
-					v-model="queryParams.materialName"
-					placeholder="请输入物料名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="检验结果" prop="checkResult">
-				<el-select
-				v-model="queryParams.checkResult"
-				placeholder="检验结果"
-				clearable
-				>
-				<el-option
-					v-for="dict in dict.type.check_result"
-					:key="dict.value"
-					:label="dict.label"
-					:value="dict.value"
-				/>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="入库时间" prop="incomeTimeArray">
-                <el-date-picker
-				v-model="queryParams.incomeTimeArray"
-				format="yyyy-MM-dd HH:mm:ss"
-				type="datetimerange"
-				range-separator="至"
-				start-placeholder="开始日期"
-				end-placeholder="结束日期">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="检测地点" prop="checkLoc">
-				<el-input
-					v-model="queryParams.checkLoc"
-					placeholder="请输入检测地点"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="检验时间" prop="checkTimeArray">
                 <el-date-picker
 				v-model="queryParams.checkTimeArray"
 				format="yyyy-MM-dd HH:mm:ss"
@@ -124,6 +69,17 @@
 					v-hasPermi="['quality:qcInventory:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-magic-stick"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['quality:qcInventory:edit']"
+				>审核编辑</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -131,20 +87,18 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
-			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
+			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="100"/>
-			<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="120"/>
+			<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="100"/>
-			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
+			<el-table-column label="物料号" align="center" prop="materialCode" width="80"/>
-			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
+			<el-table-column label="物料名称" align="center" prop="materialName" width="100"/>
-			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
+			<el-table-column label="仓库编码" align="center" prop="supplierCode" width="90"/>
-			<el-table-column label="单位" align="center" prop="unit" />
+			<el-table-column label="仓库名称" align="center" prop="supplierName" width="90"/>
-			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
+			<el-table-column label="检测地点" align="center" prop="checkLoc" width="100"/>
-			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="创建时间" align="center" prop="checkTime" width="100">
-			<el-table-column label="入库时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
 			<el-table-column label="检测状态" align="center" prop="checkStatus" >
 				<template slot-scope="scope">
 					<dict-tag
@@ -155,33 +109,12 @@
 			</el-table-column>
 			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="100"/>
 			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="100"/>
-			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
+			<el-table-column label="检验时间" align="center" prop="checkTime" width="100">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="检验结果" align="center" prop="checkResult" />
-
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleCheckProject(scope.row)"
-						v-hasPermi="['quality:qcIncome:edit']"
-					>检验</el-button>
-					<!--
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['quality:qcIncome:remove']"
-					>删除</el-button>
-					-->
-				</template>
-			</el-table-column>
 		</el-table>
 
 		<pagination
@@ -213,14 +146,6 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
-						<el-form-item label="批次号" prop="incomeBatchNo">
-							<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
 					<el-col :span="8">
 				   		<el-form-item label="物料名称" prop="materialName">
 							<el-input v-model="form.materialName" placeholder="请选择物料名称">
@@ -228,31 +153,23 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
+					
+				</el-row>
+				<el-row>
 					<el-col :span="8">
 						<el-form-item label="物料号" prop="materialCode">
 							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="入库时间" prop="incomeTime">
+						<el-form-item label="批次号" prop="incomeBatchNo">
-							<el-date-picker clearable
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
-								v-model="form.incomeTime"
+							</el-input>
-								type="datetime"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								placeholder="请选择入库时间">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="6">
-						<el-form-item label="抽样数量" prop="sampleQuality">
-							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6" v-for="(item,index) in form.defects" :key="index">
+					<el-col :span="8">
-						<el-form-item :label="item.defectSubclass" prop="">
+						<el-form-item label="入库时间" prop="incomeTime">
-							<el-input type="number" v-model="item.noOkQuality" placeholder="请输入不合格数量" />
+							<el-input v-model="form.incomeTime" placeholder="" disabled/>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -283,11 +200,7 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					
-						<el-form-item label="检测地点" prop="checkLoc">
-							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
-						</el-form-item>
-					</el-col>
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -410,9 +323,9 @@ export default {
 				incomeTime: [
 					{ required: true, message: "来料时间不能为空", trigger: "blur" }
 				],
-				checkManName: [
+				//checkManName: [
-					{ required: true, message: "检测人不能为空", trigger: "blur" }
+				//	{ required: true, message: "检测人不能为空", trigger: "blur" }
-				],
+				//],
 				checkLoc: [
 					{ required: true, message: "检测地点不能为空", trigger: "blur" }
 				],

src/views/quality/qcProduce/index.vue

@@ -226,14 +226,14 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcProduce:edit']"
 					>检验</el-button>
-					<!--
+					
 					<el-button
 						size="mini"
 						type="text"
-						icon="el-icon-delete"
+						icon="el-icon-magic-stick"
-						@click="handleDelete(scope.row)"
+						@click="handleCheckProjectM(scope.row)"
-						v-hasPermi="['quality:qcProduce:remove']"
+						v-hasPermi="['quality:qcProduce:editM']"
-					>删除</el-button>-->
+					>审核编辑</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -802,6 +802,11 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'produce');
 		},
+		//检验项目弹窗(二次编辑)
+		handleCheckProjectM(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(row,'material');
+		},
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;

src/views/quality/qcTableDL/index.vue

@@ -151,17 +151,16 @@
           >折线图表分析</el-button
         >
       </el-col>
-         <!--
       <el-col :span="1.5">
         <el-button
-          type="primary"
+          type="danger"
           plain
-          icon="el-icon-s-data"
+          icon="el-icon-place"
           size="mini"
-          @click="handleAnalysis3"
+          @click="handleCPK"
-          >综合图表分析</el-button
+          >CPK分析</el-button
         >
-      </el-col>-->
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -239,7 +238,7 @@
 
 <script>
 import {
-  getDLTableAvgInfo,
+  getDLTableAvgInfo,getDLTableCPKInfo,
   getDLDetailList,
   getCheckTypeList,
   getSupplierList,
@@ -884,8 +883,8 @@ export default {
       myChart1.setOption(option1);
     },
     // 图表分析
-    handleAnalysis3() {
+    handleCPK() {
-      this.title = "综合图表分析";
+      this.title = "CPK分析";
       if (
         this.queryParams.projectNoArray.length > 0 &&
         this.queryParams.projectNoArray.length < 2
@@ -909,7 +908,7 @@ export default {
         ).format("YYYY-MM-DD");
       }
 
-      getDLTableAvgInfo(this.queryParams).then((response) => {
+      getDLTableCPKInfo(this.queryParams).then((response) => {
         this.detailechartslist = [];
         this.seriesdata = [];
         this.legenddata = [];
@@ -1001,7 +1000,7 @@ export default {
       var myChart1 = echarts.init(document.querySelector("#echart1"));
       var option3 =  {
         title: {
-            text: '综合图表分析'
+            text: 'CPK分析'
           },
           tooltip: {
             trigger: 'axis'
@@ -1029,41 +1028,6 @@ export default {
             type: 'value'
           },
           series: this.seriesdata
-          /**[
-            {
-              name: 'Email',
-              type: 'line',
-              stack: 'Total',
-              data: [120, 132, 101, 134, 90, 230, 210],
-              markLine: {
-                symbolSize: 0,//不展示上下限两边的图标
-                data: [
-                  {
-                    lineStyle: {
-                      color: '#ffc000',
-                      width: 3
-                    },
-                    yAxis: 200,//控制限制刻度
-                    label: { show: true, position: 'end', formatter: '上限' }
-                  },
-                  {
-                    lineStyle: {
-                      color: '#4f81bd',
-                      width: 3
-                    },
-                    yAxis: 100,
-                    label: { show: true, position: 'end', formatter: '下限' }
-                  }
-                ]
-              }
-            },
-            {
-              name: 'Union Ads',
-              type: 'line',
-              stack: 'Total',
-              data: [220, 182, 191, 234, 290, 330, 310]
-            }
-          ]**/
       };
       myChart1.setOption(option3);
     },

src/views/quality/qcWarehousing/index.vue

@@ -218,6 +218,14 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcWarehousing:edit']"
 					>检验</el-button>
+
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-magic-stick"
+						@click="handleCheckProjectM(scope.row)"
+						v-hasPermi="['quality:qcWarehousing:editM']"
+					>审核编辑</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -756,6 +764,12 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'product');
 		},
+		//检验项目弹窗(二次编辑)
+		handleCheckProjectM(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(row,'material');
+		},
+
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;