Merge remote-tracking branch 'origin/master'

src/api/plan/whiteOrder.js

@@ -51,3 +51,14 @@ export function delWhiteOrder(id) {
 		method: 'delete'
 	});
 }
+
+// 同步SAP订单
+export function syncSAPbp() {
+	const data = {
+	}
+	return request({
+		url: '/plan/whiteOrder/syncSAPbp',
+		method: 'post',
+		data: data
+	});
+}

src/api/quality/income.js

@@ -186,8 +186,8 @@ export function getPutInOrder(query) {
 	  method: 'get',
 	  params: query
 	});
-  }  
+  }
-  
+
 
 // 查询入库订单列表
 export function getProductWorkOrder(query) {
@@ -223,4 +223,24 @@ export function togetherTask(recordId,factoryCode) {
 		method: 'post',
 		data: data
 	});
+}
+
+//应用最新检验方案
+export function changeTaskDetail(recordId) {
+	const data = {
+		recordId
+	}
+	return request({
+		url: '/quality/qcIncome/changeTaskDetail',
+		method: 'post',
+		data: data
+	});
+}
+
+export function getWarehouseList(query) {
+	return request({
+		url: '/quality/qcIncome/getWarehouseList',
+		method: 'get',
+		params: query
+	});
 }

src/views/mes/mesLine/index.vue

@@ -134,7 +134,7 @@
       <el-table-column label="标准效率(PC/小时)" align="center" prop="hourEfficiency" width="120"/>
       <el-table-column label="标准工时" align="center" prop="attr1" width="100"/>
       <!--<el-table-column label="产品列表" align="left"  prop="productList" :formatter="formatProductNames" :show-overflow-tooltip="true"/>-->
-      <el-table-column width="120"
+      <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"

src/views/mes/prepare/index.vue

@@ -275,7 +275,7 @@
 
 				<el-table-column prop="routeCode" width="75" label="实发"></el-table-column>
 				<el-table-column prop="routeCode" width="75" label="数量2"></el-table-column>
-
+		      
           </el-table>
 		  <!-- 底部 -->
           <el-row class="my-print-foot0">
@@ -313,7 +313,7 @@ export default {
 	data() {
 		return {
 		fenyeNumber:5,
-		fenyeNumberTwo:7,
+		fenyeNumberTwo:5,
 	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,
@@ -511,7 +511,7 @@ export default {
 	// 遍历this.printData.workTable
      for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
 
-
+		
 		// 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
 		let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
 		// 将切割后的数组添加到chunkedArray中
@@ -595,12 +595,20 @@ export default {
 			this.resetForm("queryForm");
 			this.handleQuery();
 		},
+		/**单选**/
+		handleCurrentChange(selection) {
+			this.ids = selection.prepareId
+			this.single = selection==null
+			this.selectPrepare = []
+      		this.selectPrepare.push(selection)
+		},
+
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.prepareId)
 			this.single = selection.length!==1
 			this.multiple = !selection.length
-      this.selectPrepare = selection
+      		this.selectPrepare = selection
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
@@ -659,16 +667,16 @@ export default {
 </script>
 <style>
 .my-print-table .el-table {
-  border-collapse: collapse;
+  border-collapse: collapse; 
-  border-spacing: 0;
+  border-spacing: 0; 
 }
 
 
 .my-print-table .el-table__header-wrapper th {
-  border: 1px solid black !important;
+  border: 1px solid black !important; 
 }
 .my-print-table .el-table__body-wrapper td {
-  border: 1px solid black !important;
+  border: 1px solid black !important; 
 }
 
 .my-print-head {

src/views/mes/reportWork/index.vue

@@ -448,6 +448,7 @@
 									@change="handleEdit(scope.$index, scope.row)"></el-input>
 							</template>
 						</el-table-column>
+            
 						<el-table-column label="单位" width="50" align="center" prop="unit" />
 						<el-table-column label="反冲标识" align="center" prop="recoil" />
             <el-table-column label="sap项目编码" align="center" prop="rspos" />
@@ -461,6 +462,8 @@
 								</el-select>
 							</template>
 						</el-table-column>
+            <el-table-column label="订单数量" width="110" align="left" prop="quantitySplit" />
+            <el-table-column label="Bom用量" width="110" align="left" prop="quantitySplitBom" />
             <el-table-column label="报工单编号" align="center" prop="reportCode" width="90" :show-overflow-tooltip="true"/>
 						<el-table-column label="创建时间" align="center" prop="createTime" width="130" :show-overflow-tooltip="true"/>
             <el-table-column label="工单编码" width="80" align="left" prop="workorderCode"

src/views/plan/order/index.vue

@@ -370,7 +370,7 @@
     </el-dialog>
 
     <!-- 拆分模块 -->
-    <el-dialog :title="title" :visible.sync="splitOpen" width="1000px">
+    <el-dialog :title="title" :visible.sync="splitOpen" width="1000px" :before-close="handleCloseS">
       <!-- 拆分头pro -->
       <el-table
         border
@@ -1657,6 +1657,11 @@ export default {
       },
       handleClose() {
         this.cancel();
+      },
+      handleCloseS(done){
+        this.$confirm('确认关闭?').then(_=>{
+          done();
+        }).catch(_=>{});
       },
        shiftFormat(row,column){
         let array = this.workShift;

src/views/plan/whiteOrder/index.vue

@@ -72,6 +72,16 @@
         >新增
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleSyncSAP"
+          v-hasPermi="['plan:whiteOrder:add']"
+        >SAP白坯订单同步</el-button>
+      </el-col>
       <!--
       <el-col :span="1.5">
         <el-button
@@ -360,7 +370,7 @@
     </el-dialog>
 
     <!-- 拆分模块 -->
-    <el-dialog title="拆分" :visible.sync="splitOpen" width="1000px" append-to-body>
+    <el-dialog title="拆分" :visible.sync="splitOpen" width="1000px" append-to-body :before-close="handleCloseS">
       <!-- 拆分头pro -->
       <el-table
         border
@@ -598,7 +608,7 @@ import {
   getWhiteOrder,
   delWhiteOrder,
   addWhiteOrder,
-  updateWhiteOrder
+  updateWhiteOrder,syncSAPbp
 } from "@/api/plan/whiteOrder";
 import {getToken} from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect";
@@ -752,6 +762,9 @@ export default {
         pageSize: 10,
       },
       materielBP: [],
+      countdownTime: 0,// 倒计时时间
+      isButtonDisabled: false, // 按钮是否禁用
+      countdownInterval: null, // 倒计时定时器
     };
   },
   created() {
@@ -1540,6 +1553,53 @@ export default {
 
       this.innerBPVisible = false;
     },
+
+      handleCloseS(done){
+        this.$confirm('确认关闭?').then(_=>{
+          done();
+        }).catch(_=>{});
+      },
+
+        // 首-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 _this = this;
+      this.$modal.confirm('是否确认SAP同步操作步骤？执行后，需要稍后查看同步结果').then(function () {
+        _this.loading = false;
+        syncSAPbp()
+      }).then(() => {
+        //this.getList()
+        _this.loading = false;
+        this.$modal.msgSuccess('同步成功')
+      }).catch(
+        function (e) {
+          if (e == 'cancel') {
+              _this.loading = false;
+          } else if(e == 'close') {
+              _this.loading = false;
+
+          }
+      }
+      )
+    },
   }
 };
 </script>

src/views/quality/defectType/codeContent.vue

@@ -31,7 +31,7 @@
                             icon="el-icon-plus"
                             size="mini"
                             @click="handleAdd"
-                            v-hasPermi="['system:class:add']"
+
                     >新增
                     </el-button>
                 </el-col>
@@ -43,7 +43,7 @@
                             size="mini"
                             :disabled="single"
                             @click="handleUpdate"
-                            v-hasPermi="['system:class:edit']"
+
                     >修改
                     </el-button>
                 </el-col>
@@ -55,7 +55,7 @@
                             size="mini"
                             :disabled="multiple"
                             @click="handleDelete"
-                            v-hasPermi="['system:class:remove']"
+
                     >删除
                     </el-button>
                 </el-col>
@@ -74,7 +74,6 @@
                                 type="text"
                                 icon="el-icon-edit"
                                 @click="handleUpdate(scope.row)"
-                                v-hasPermi="['system:class:edit']"
                         >修改
                         </el-button>
                         <el-button
@@ -82,7 +81,6 @@
                                 type="text"
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.row)"
-                                v-hasPermi="['system:class:remove']"
                         >删除
                         </el-button>
                     </template>

src/views/quality/qcIncome/index.vue

@@ -145,26 +145,37 @@
 					v-hasPermi="['quality:qcIncome:edit']"
 				>合并任务</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="single"
+					@click="handleChangeTaskDetail"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>应用最新检验方案</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
-		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange" height="500px">
 			<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="120" fixed>
 				<template slot-scope="scope">
 				<el-button type="text" @click="handleView(scope.row)">{{
 					scope.row.checkNo
 				}}</el-button>
 				</template>
 			</el-table-column>
-			<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
+			<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120" fixed/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="120" fixed/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"
-			:formatter="productCodeFormate"
+			:formatter="productCodeFormate" fixed
 			/>
-			<el-table-column label="物料名称" align="center" prop="materialName" width="150" :show-overflow-tooltip="true"/>
+			<el-table-column label="物料名称" align="center" prop="materialName" width="150" :show-overflow-tooltip="true" fixed/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="样本量编码" align="center" prop="sampleCode" width="120"/>
@@ -401,8 +412,8 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, 
+import { listIncome, getIncome, delIncome, addIncome,
-updateIncome ,changeIncomeStatus,togetherTask
+updateIncome ,changeIncomeStatus,togetherTask,changeTaskDetail
 } from "@/api/quality/income";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
@@ -763,7 +774,17 @@ export default {
 			getDefectTypeListByDefectType(defectType).then(response => {
 				this.defectTypeList = response.rows;
 			});
-		}
+		},
+		/** 合并按钮操作 */
+		handleChangeTaskDetail(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认应用最新检验方案重新生产检验任务（无法撤销）？').then(function() {
+				return changeTaskDetail(recordIds[0]);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("应用成功");
+			}).catch(() => {});
+		},
 	}
 };
 </script>

src/views/quality/qcInventory/index.vue

@@ -9,7 +9,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="任务创建时间" prop="checkTimeArray" label-width="120px">
                 <el-date-picker
 				v-model="queryParams.checkTimeArray"
@@ -101,6 +101,17 @@
 					v-hasPermi="['quality:qcInventory:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="single"
+					@click="handleChangeTaskDetail"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>应用最新检验方案</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -192,7 +203,7 @@
 								<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
-					</el-col>		
+					</el-col>
 				</el-row>
 				<el-row>
 				    <el-col :span="8">
@@ -268,6 +279,7 @@
 
 <script>
 import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, delQcInventory } from "@/api/quality/qcInventory.js";
+import { changeTaskDetail} from "@/api/quality/income";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import ItemPutInOrder from "./selectPutInOrder.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
@@ -357,9 +369,6 @@ export default {
 				incomeTime: [
 					{ required: true, message: "来料时间不能为空", trigger: "blur" }
 				],
-				//checkManName: [
-				//	{ required: true, message: "检测人不能为空", trigger: "blur" }
-				//],
 				checkLoc: [
 					{ required: true, message: "检测地点不能为空", trigger: "blur" }
 				],
@@ -533,9 +542,9 @@ export default {
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			this.download('quality/qcIncome/export', {
+			this.download('quality/qcInventory/export', {
 				...this.queryParams
-			}, `income_${new Date().getTime()}.xlsx`)
+			}, `inventory${new Date().getTime()}.xlsx`)
 		},
 
 		// 数据状态修改
@@ -611,6 +620,16 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'inventory');
 		},
+		/** 应用最新版本按钮操作 */
+		handleChangeTaskDetail(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认应用最新检验方案重新生产检验任务（无法撤销）？').then(function() {
+				return changeTaskDetail(recordIds[0]);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("应用成功");
+			}).catch(() => {});
+		},
 	}
 };
 </script>

src/views/quality/qcInventory/selectPutInOrder.vue

@@ -29,13 +29,21 @@
           </el-form-item>
            <el-form-item label="订单号">
             <el-input
-              v-model="queryParams.orderNo"
+              v-model="queryParams.workorderCodeSap"
               placeholder="订单号"
               clearable
               style="width: 150px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="仓库名称">
+            <el-select v-model="queryParams.supplierCode" placeholder="请选择仓库" width="50%" clearable>
+              <el-option v-for="work in cwarehouseList" 
+              :key="work.supplierCode"
+                :label="work.supplierName" 
+                :value="work.supplierCode"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -43,8 +51,8 @@
         </el-form>
         <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
           <el-table-column width="50" align="center" type="selection"/>
-          <el-table-column label="单号" align="left"  prop="orderNo" width="120"/>
+          <!--<el-table-column label="订单号" align="left"  prop="workorderCodeSap" width="100"/>-->
-          
+          <el-table-column label="唯一单号" align="left"  prop="orderNo" width="130"/>
           <el-table-column label="物料编码"  align="left" prop="materialCode" width="180" />
           <el-table-column label="物料名称"  align="left" prop="materialName" width="180"/>
           <el-table-column label="数量"  align="left" prop="quality" width="100" />
@@ -75,7 +83,7 @@
 </template>
 <script>
 
-import { getPutInOrder } from "@/api/quality/income";
+import { getPutInOrder,getWarehouseList } from "@/api/quality/income";
 export default {
   name: "itemPutInOrder",
   data() {
@@ -106,11 +114,13 @@ export default {
         pageSize: 10,
         workorderCode: ''
       },
-      selectionRow:{}
+      selectionRow:{},
+      cwarehouseList: [],
     };
   },
   created() {
     this.getList();
+    this.getWarehouseList();
   },
 
   methods: {
@@ -137,8 +147,13 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    //获取报工物料损耗仓库下拉列表
+    getWarehouseList() {
+      getWarehouseList({}).then((data) => {
+        this.cwarehouseList = data;
+      });
+    },
 
-    
     // 多选框选中数据
 		handleBomSelectionChange(selection) {
 

src/views/quality/qcProduce/index.vue

@@ -156,7 +156,7 @@
 					v-hasPermi="['quality:qcProduce:edit']"
 				>修改</el-button>
 			</el-col>
-			
+
 			<el-col :span="1.5">
 				<el-button
 					type="danger"
@@ -178,6 +178,17 @@
 					v-hasPermi="['quality:qcProduce:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="single"
+					@click="handleChangeTaskDetail"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>应用最新检验方案</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -247,7 +258,7 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcProduce:edit']"
 					>检验</el-button>
-					
+
 					<el-button
 						size="mini"
 						type="text"
@@ -470,6 +481,7 @@
 import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,
 	getCheckTypes,changeProduceStatus,getBatchList
 } from "@/api/quality/qcProduce";
+import { changeTaskDetail} from "@/api/quality/income";
 import moment from 'moment';
 import ItemSelectWorkOrder from "./selectWorkOrder.vue";
 import ItemSelectWorkCenter from "./selectWorkCenter";
@@ -836,12 +848,23 @@ export default {
 		saveCheck(){
             this.getList();
 		},
+		/** 应用最新版本按钮操作 */
+		handleChangeTaskDetail(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认应用最新检验方案重新生产检验任务（无法撤销）？').then(function() {
+				return changeTaskDetail(recordIds[0]);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("应用成功");
+			}).catch(() => {});
+		},
 		handleDefectType() {
 			const defectType = "produce"
 			getDefectTypeListByDefectType(defectType).then(response => {
 				this.defectTypeList = response.rows;
 			});
-		}
+		},
+
 	}
 };
 </script>

src/views/quality/qcTableXJ/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
-			<el-form-item label="订单编码" prop="orderNo">
+			<el-form-item label="订单编码" prop="workorderCodeSap">
 				<el-input
-					v-model="queryParams.orderNo"
+					v-model="queryParams.workorderCodeSap"
 					placeholder="请输入订单编码"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -126,7 +126,7 @@
 import { getXJCheckTableList,getXJCheckTableDetail } from "@/api/quality/qcTable";
 import moment from "moment/moment";
 export default {
-	name: "Prepare",
+	name: "QcTableXJ",
 	// components: {Detail},
 	data() {
 		return {

src/views/quality/qcWarehousing/index.vue

@@ -30,7 +30,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="订单号" prop="workorderCodeSap">
 				<el-input
 					v-model="queryParams.workorderCodeSap"
@@ -172,6 +172,17 @@
 					v-hasPermi="['quality:qcWarehousing:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="single"
+					@click="handleChangeTaskDetail"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>应用最新检验方案</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -431,7 +442,7 @@
 import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
 import { getBatchList} from "@/api/quality/qcProduce";
 import { getCheckTypes } from "@/api/quality/qcProduce";
-//import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
+import { changeTaskDetail} from "@/api/quality/income";
 import ItemSelectWorkOrder from "../qcProduce/selectWorkOrder.vue";
 import ItemSelectWorkCenter from "../qcProduce/selectWorkCenter";
 import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
@@ -794,6 +805,16 @@ export default {
 		saveCheck(){
             this.getList();
 		},
+		/** 应用最新版本按钮操作 */
+		handleChangeTaskDetail(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认应用最新检验方案重新生产检验任务（无法撤销）？').then(function() {
+				return changeTaskDetail(recordIds[0]);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("应用成功");
+			}).catch(() => {});
+		},
 		handleDefectType() {
 			const defectType = "product";
 			getDefectTypeListByDefectType(defectType).then(response => {