Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts:
#	klp-ui/src/views/micro/pages/acid/components/Model.vue
#	klp-ui/src/views/micro/pages/acid/index.vue

klp-ui/src/api/erp/purchaseRequisition.js

@@ -35,27 +35,30 @@ export function updatePurchaseRequisition(data) {
   })
 }
 
-// 提交审批
-export function submitApproval(reqId) {
+// 提交审批（指定一审人）
+export function submitApproval(reqId, firstApproverId, firstApproverName) {
   return request({
     url: '/erp/purchaseRequisition/' + reqId + '/submit',
-    method: 'put'
+    method: 'put',
+    params: { firstApproverId, firstApproverName }
   })
 }
 
 // 审批通过
-export function approvePurchase(reqId) {
+export function approvePurchase(reqId, approvalOpinion) {
   return request({
     url: '/erp/purchaseRequisition/' + reqId + '/approve',
-    method: 'put'
+    method: 'put',
+    params: { approvalOpinion }
   })
 }
 
 // 驳回
-export function rejectPurchase(reqId) {
+export function rejectPurchase(reqId, approvalOpinion) {
   return request({
     url: '/erp/purchaseRequisition/' + reqId + '/reject',
-    method: 'put'
+    method: 'put',
+    params: { approvalOpinion }
   })
 }
 
@@ -76,3 +79,11 @@ export function exportPurchaseRequisition(query) {
     responseType: 'blob'
   })
 }
+
+// 查询请购审批人列表（角色标识由后端配置）
+export function selectApproverUsers() {
+  return request({
+    url: '/system/user/approverUsers/list',
+    method: 'get'
+  })
+}

klp-ui/src/api/mes/qc/inspectionMain.js

@@ -42,3 +42,12 @@ export function delInspectionMain(mainId) {
     method: 'delete'
   })
 }
+
+// 批量新增检验主及明细，并更新申请单detailIds
+export function batchInsertMainWithDetails(data) {
+  return request({
+    url: '/wms/inspectionMain/batchInsertWithDetails',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/api/mes/qc/inspectionTensileDetail.js

@@ -42,3 +42,12 @@ export function delInspectionTensileDetail(detailId) {
     method: 'delete'
   })
 }
+
+// 批量插入明细并更新申请单detailIds
+export function batchInsertTensileDetails(data) {
+  return request({
+    url: '/wms/inspectionTensileDetail/batchInsertDetails',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/api/pltcm/model.js

@@ -0,0 +1,154 @@
+import request from '@/utils/request'
+
+// ═══════════════════════════════════════
+// 厚度分类
+// ═══════════════════════════════════════
+export function listThickClass(query) {
+  return request({ url: '/pltcm/thickClass/list', method: 'get', params: query })
+}
+
+export function getThickClass(classId) {
+  return request({ url: '/pltcm/thickClass/' + classId, method: 'get' })
+}
+
+export function addThickClass(data) {
+  return request({ url: '/pltcm/thickClass', method: 'post', data })
+}
+
+export function updateThickClass(data) {
+  return request({ url: '/pltcm/thickClass', method: 'put', data })
+}
+
+export function delThickClass(classIds) {
+  return request({ url: '/pltcm/thickClass/' + classIds, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 宽度分类
+// ═══════════════════════════════════════
+export function listWidthClass(query) {
+  return request({ url: '/pltcm/widthClass/list', method: 'get', params: query })
+}
+
+export function getWidthClass(classId) {
+  return request({ url: '/pltcm/widthClass/' + classId, method: 'get' })
+}
+
+export function addWidthClass(data) {
+  return request({ url: '/pltcm/widthClass', method: 'post', data })
+}
+
+export function updateWidthClass(data) {
+  return request({ url: '/pltcm/widthClass', method: 'put', data })
+}
+
+export function delWidthClass(classIds) {
+  return request({ url: '/pltcm/widthClass/' + classIds, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 屈服强度分类
+// ═══════════════════════════════════════
+export function listYieldStressClass(query) {
+  return request({ url: '/pltcm/yieldStressClass/list', method: 'get', params: query })
+}
+
+export function getYieldStressClass(classId) {
+  return request({ url: '/pltcm/yieldStressClass/' + classId, method: 'get' })
+}
+
+export function addYieldStressClass(data) {
+  return request({ url: '/pltcm/yieldStressClass', method: 'post', data })
+}
+
+export function updateYieldStressClass(data) {
+  return request({ url: '/pltcm/yieldStressClass', method: 'put', data })
+}
+
+export function delYieldStressClass(classIds) {
+  return request({ url: '/pltcm/yieldStressClass/' + classIds, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 策略关联
+// ═══════════════════════════════════════
+export function listStrategy(query) {
+  return request({ url: '/pltcm/strategy/list', method: 'get', params: query })
+}
+
+export function getStrategy(id) {
+  return request({ url: '/pltcm/strategy/' + id, method: 'get' })
+}
+
+export function addStrategy(data) {
+  return request({ url: '/pltcm/strategy', method: 'post', data })
+}
+
+export function updateStrategy(data) {
+  return request({ url: '/pltcm/strategy', method: 'put', data })
+}
+
+export function delStrategy(ids) {
+  return request({ url: '/pltcm/strategy/' + ids, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 屈服强度与钢种对应关系
+// ═══════════════════════════════════════
+export function listSteelgrade(query) {
+  return request({ url: '/pltcm/steelgrade/list', method: 'get', params: query })
+}
+
+export function getSteelgrade(steelGrade) {
+  return request({ url: '/pltcm/steelgrade/' + steelGrade, method: 'get' })
+}
+
+export function addSteelgrade(data) {
+  return request({ url: '/pltcm/steelgrade', method: 'post', data })
+}
+
+export function updateSteelgrade(data) {
+  return request({ url: '/pltcm/steelgrade', method: 'put', data })
+}
+
+export function delSteelgrade(steelGrades) {
+  return request({ url: '/pltcm/steelgrade/' + steelGrades, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 比例标准表
+// ═══════════════════════════════════════
+export function listRatio(query) {
+  return request({ url: '/pltcm/ratio/list', method: 'get', params: query })
+}
+
+export function getRatio(id) {
+  return request({ url: '/pltcm/ratio/' + id, method: 'get' })
+}
+
+export function addRatio(data) {
+  return request({ url: '/pltcm/ratio', method: 'post', data })
+}
+
+export function updateRatio(data) {
+  return request({ url: '/pltcm/ratio', method: 'put', data })
+}
+
+export function delRatio(ids) {
+  return request({ url: '/pltcm/ratio/' + ids, method: 'delete' })
+}
+
+// ═══════════════════════════════════════
+// 设备启用状态
+// ═══════════════════════════════════════
+export function listDeviceEnable(query) {
+  return request({ url: '/pltcm/deviceEnable/list', method: 'get', params: query })
+}
+
+export function getDeviceEnable(id) {
+  return request({ url: '/pltcm/deviceEnable/' + id, method: 'get' })
+}
+
+export function updateDeviceEnable(data) {
+  return request({ url: '/pltcm/deviceEnable', method: 'put', data })
+}