Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-ui/src/api/aps/materialCoil.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询钢卷物料列表
+export function listMaterialCoil(query) {
+  return request({
+    url: '/wms/materialCoil/list',
+    method: 'get',
+    params: query
+  })
+}

klp-ui/src/api/crm/coil.js

@@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+// ==================== 配卷列表查询 ====================
+
+// 指定客户的发货配卷列表
+export function listDeliveryCoilsByCustomer(customerId) {
+  return request({
+    url: '/crm/orderItem/coils/customer/' + customerId,
+    method: 'get'
+  })
+}
+
+// 指定合同的发货配卷列表（分页）
+export function listDeliveryCoilsByOrder(orderId, query) {
+  return request({
+    url: `/crm/orderItem/coils/order/${orderId}`,
+    method: 'get',
+    params: query
+  })
+}
+
+// 指定销售员的发货配卷列表（分页）
+export function listDeliveryCoilsByPrincipal(query) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/coilListByPrincipal',
+    method: 'get',
+    params: query
+  })
+}
+
+// 指定销售员的生产成果列表（分页）
+export function listProductCoilsBySalesman(query) {
+  return request({
+    url: '/crm/orderItem/coils/bySalesman',
+    method: 'get',
+    params: query
+  })
+}
+
+// 指定合同的生产成果列表（分页）
+export function listProductCoilsByContract(contractId, query) {
+  return request({
+    url: `/crm/orderItem/coils/byContract/${contractId}`,
+    method: 'get',
+    params: query
+  })
+}
+
+// ==================== 配卷统计汇总 ====================
+
+// 根据订单ID统计发货配卷汇总
+export function getDeliveryCoilsStatisticsByOrder(orderId) {
+  return request({
+    url: `/crm/orderItem/coils/order/${orderId}/statistics`,
+    method: 'get'
+  })
+}
+
+// 根据销售员统计生产成果汇总
+export function getProductCoilsStatisticsBySalesman(salesman) {
+  return request({
+    url: '/crm/orderItem/coils/bySalesman/statistics',
+    method: 'get',
+    params: { salesman }
+  })
+}
+
+// 根据合同ID统计生产成果汇总
+export function getProductCoilsStatisticsByContract(contractId) {
+  return request({
+    url: `/crm/orderItem/coils/byContract/${contractId}/statistics`,
+    method: 'get'
+  })
+}
+
+// 根据负责人统计发货配卷汇总
+export function getDeliveryCoilsStatisticsByPrincipal(principal) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/coilListByPrincipal/statistics',
+    method: 'get',
+    params: { principal }
+  })
+}

klp-ui/src/api/crm/order.js

@@ -44,12 +44,13 @@ export function delOrder(orderId) {
 }
 
 /**
- * 查询该订单下的所有配卷
+ * 查询该订单下的配卷（分页）
  */
-export function listOrderPackaging(orderId) {
+export function listOrderPackaging(orderId, query) {
   return request({
     url: `/crm/orderItem/coils/order/${orderId}`,
     method: 'get',
+    params: query
   })
 }
 

klp-ui/src/api/hrm/index.js

@@ -1,4 +1,3 @@
-// 导出所有 HRM 模块 API
 export * from './employee'
 export * from './org'
 export * from './certContract'

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

@@ -0,0 +1,94 @@
+import request from '@/utils/request'
+
+// 查询质量评审单列表
+export function listQualityReview(query) {
+  return request({
+    url: '/qc/qualityReview/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询质量评审单详细
+export function getQualityReview(reviewId) {
+  return request({
+    url: '/qc/qualityReview/' + reviewId,
+    method: 'get'
+  })
+}
+
+// 新增质量评审单
+export function addQualityReview(data) {
+  return request({
+    url: '/qc/qualityReview',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改质量评审单
+export function updateQualityReview(data) {
+  return request({
+    url: '/qc/qualityReview',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除质量评审单
+export function delQualityReview(reviewIds) {
+  return request({
+    url: '/qc/qualityReview/' + reviewIds,
+    method: 'delete'
+  })
+}
+
+// 提交送审
+export function submitQualityReview(reviewId) {
+  return request({
+    url: '/qc/qualityReview/submit/' + reviewId,
+    method: 'post'
+  })
+}
+
+// 审批通过
+export function approveQualityReview(data) {
+  return request({
+    url: '/qc/qualityReview/approve',
+    method: 'post',
+    data: data
+  })
+}
+
+// 驳回
+export function rejectQualityReview(reviewId, reason) {
+  return request({
+    url: '/qc/qualityReview/reject/' + reviewId,
+    method: 'post',
+    params: { reason }
+  })
+}
+
+// 执行改判
+export function executeQualityReview(reviewId) {
+  return request({
+    url: '/qc/qualityReview/execute/' + reviewId,
+    method: 'post'
+  })
+}
+
+// 查询钢卷明细
+export function listQualityReviewCoil(reviewId) {
+  return request({
+    url: '/qc/qualityReview/coilList/' + reviewId,
+    method: 'get'
+  })
+}
+
+// 查询审批日志
+export function listQualityReviewLog(reviewId) {
+  return request({
+    url: '/qc/qualityReview/logList/' + reviewId,
+    method: 'get'
+  })
+}

klp-ui/src/api/system/file.js

@@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+// 查询文件列表
+export function listFile(query) {
+  return request({
+    url: '/system/file/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询文件详细
+export function getFile(fileId) {
+  return request({
+    url: '/system/file/' + fileId,
+    method: 'get'
+  })
+}
+
+// 新增文件
+export function addFile(data) {
+  return request({
+    url: '/system/file',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改文件
+export function updateFile(data) {
+  return request({
+    url: '/system/file',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除文件
+export function delFile(fileIds) {
+  return request({
+    url: '/system/file/' + fileIds,
+    method: 'delete'
+  })
+}
+
+// 导出文件列表
+export function exportFile(query) {
+  return request({
+    url: '/system/file/export',
+    method: 'post',
+    params: query
+  })
+}
+
+// 查询与我相关的文件
+export function listRelatedToMe(query) {
+  return request({
+    url: '/system/file/relatedToMe',
+    method: 'get',
+    params: query
+  })
+}
+
+// ============ 文件可见用户关联 ============
+
+// 查询可见用户列表
+export function listVisibleUser(query) {
+  return request({
+    url: '/system/fileVisibleUser/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增可见用户关联
+export function addVisibleUser(data) {
+  return request({
+    url: '/system/fileVisibleUser',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除可见用户关联
+export function delVisibleUser(visibleIds) {
+  return request({
+    url: '/system/fileVisibleUser/' + visibleIds,
+    method: 'delete'
+  })
+}
+
+// 按文件ID查询可见用户列表
+export function listVisibleUserByFileId(fileId) {
+  return request({
+    url: '/system/fileVisibleUser/list',
+    method: 'get',
+    params: { fileId: fileId }
+  })
+}

klp-ui/src/api/wms/contractCoilStatistics.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询合同挂接情况统计
+export function getContractCoilStatistics(query) {
+  return request({
+    url: '/wms/coilContractRel/statistics',
+    method: 'get',
+    params: query
+  })
+}

klp-ui/src/api/wms/deliveryWaybillDetail.js

@@ -69,13 +69,11 @@ export function getBoundCoilStatisticsList(query) {
   })
 }
 
-// 按销售员查询订单明细的卷
-export function listDeliveryWaybillDetailBySaleman(principal) {
+// 按销售员查询订单明细的卷（分页）
+export function listDeliveryWaybillDetailBySaleman(query) {
   return request({
     url: '/wms/deliveryWaybillDetail/coilListByPrincipal',
     method: 'get',
-    params: {
-      principal: principal
-    }
+    params: query
   })
 }