From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 7817ae6..3e2922d 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -7,6 +7,7 @@
 	selectTechnologyByMaterial: "technology/select",
 	selectAll:"/material/selectAll",//鍙充晶鏁版嵁
 	technologyWrite:"/technology/write",//宸ヨ壓璺嚎锛岀Щ寮�淇濆瓨鐢熶骇瀹氶
+	writeDevice:"/technology/writeDevice",//宸ヨ壓璺嚎锛岄�夋嫨璁惧缁�,绉诲紑淇濆瓨
 	productWrite:"/product/write",//鎶�鏈寚鏍囷紝绉诲紑淇濆瓨鍐呮帶鍊煎拰鏍囧噯鍊�
 	chooseFather: "/technology/chooseFather",//鑾峰彇宸ュ簭鍒楄〃
 	chooseDevice: "/technology/chooseDevice",//鑾峰彇璁惧缁勫垪琛�
@@ -17,7 +18,18 @@
 	chooseTechByStandard:"/product/chooseTech",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓
 	chooseFatherByStandard:"/product/chooseFather",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨椤圭洰鐖剁被
 	addProductByStandard:"/product/add",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�
-
+	addMBomByStandard:"/mbom/add",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟
+	chooseTechByMBom:"/mbom/chooseTech",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟-->閫夋嫨宸ュ簭,宸ヨ壓
+	mBomWrite:"/mbom/write",//鐗╂枡娓呭崟-->鏁伴噺,绉诲紑淇濆瓨
+	chooseTechByProduct:"/technique/chooseTech",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
+	addTechniqueByStandard:"/technique/add",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
+	chooseProByProduct:"/technique/choosePro",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨椤圭洰(鐖跺瓙),鍗曚綅
+	chooseDevByProduct:"/technique/chooseDev",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨璁惧
+	addVersion:"/material/addVersion",//娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾�,鎶�鏈寚鏍�,鐗╂枡娓呭崟,鐢熶骇宸ヨ壓鐨勭増鏈�
+	delAllByTechnology:"/technology/delAllTech",//宸ヨ壓璺嚎-鎵归噺鍒犻櫎
+	delAllByTarget:"/product/delAllPro",//鎶�鏈寚鏍�-鎵归噺鍒犻櫎
+	delAllByMBom:"/mbom/delAllMbom",//鐗╂枡娓呭崟-鎵归噺鍒犻櫎
+	delAllByProduct:"/technique/delAllTeq",//鐢熶骇宸ヨ壓-鎵归噺鍒犻櫎
 	// 鎶�鏈鐞�-鎶�鏈枃浠�
 	selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
 	selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
@@ -64,6 +76,7 @@
 	inspectionItemListUser: "/inspection-item/list_user",//鏌ヨ鎵�鏈夋楠岄」鐩�
 	finishedInspectChooseMater: "/finished-inspect/chooseMater",//鏍规嵁璁㈠崟鍙峰緱鍒颁俊鎭�
 	finishedInspectAddFinish: "/finished-inspect/addFinish", //鏂板鎴愬搧妫�楠�
+	finishedInspectUpdateFinishInspectsById: "/finished-inspect/updateFinishInspectsById",//涓婃姤
 }
 // 杩囩▼妫�楠�
 const processInspection = {
@@ -126,7 +139,7 @@
 	selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
 	addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
 	material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
-	delAllMbom:"/mbom/delAllMbom",//鎵归噺鍒犻櫎
+	delAllMbom:"/mbomModel/delAllMbom",//鎵归噺鍒犻櫎
 
 	selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
 
@@ -149,6 +162,7 @@
 	delQueById:"/techniqueModel/delQueById",//鍒犻櫎
 	delAllQue:"/techniqueModel/delAllQue",//鎵归噺鍒犻櫎
 	selecQueById:"/techniqueModel/selecQueById",//缂栬緫
+	writeQueById:"/techniqueModel/writeQueById",//缂栬緫浼犲弬
 
 }
 const url = {

--
Gitblit v1.9.3