merge test

src/api/base/materialProductBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-26 20:06:29
+ * @LastEditTime: 2023-11-27 17:54:28
  * @LastEditors: DY
  * @Description: 
  */
@@ -110,3 +110,11 @@ export function deleteMaterialPBDet(id) {
     method: 'delete'
   })
 }
+
+// 获得产品Bom详细
+export function getMaterialPBDet(id) {
+  return request({
+    url: '/base/material-product-bom-det/get?id=' + id,
+    method: 'get'
+  })
+}

src/api/quality/processTraceability.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-10-31 15:05:06
- * @LastEditTime: 2023-11-03 09:05:50
+ * @LastEditTime: 2023-11-28 09:28:05
  * @LastEditors: zhp
  * @Description:
  */
@@ -24,6 +24,14 @@ export function getWorkOrderList(query) {
     params: query,
   })
 }
+
+export function getCoreProduct(id) {
+  return request({
+    url: '/base/core-product/get?id=' + id,
+    method: 'get'
+  })
+}
+
 // 导出物料信息
 // export function exportEnergyPlcExcel(query) {
 //   return request({