功能调整

api/base.js

@@ -36,11 +36,30 @@ export const reqGetGrooveTypeList = ()=>get(`BaseInfo/GetGrooveType`)
  */
 export const reqGetWeldTypeList = () => get(`BaseInfo/GetWeldType`)
 
+/**
+ * 按关键字分页查询入库明细条码
+ * @param {object} data
+ * @param {string} data.barCodeKeyword - 条码关键字
+ * @param {number} data.pageIndex - 页码（从 1 开始）
+ * @param {number} data.pageSize - 每页条数
+ */
+export const reqGetInputDetailBarCodes = (data = {}) => get('BaseInfo/GetInputDetailBarCodes', {
+	barCodeKeyword: data.barCodeKeyword ?? '',
+	pageIndex: data.pageIndex ?? 1,
+	pageSize: data.pageSize ?? 20,
+})
+
 /**
  * 获取焊接方法列表
  */
 export const reqGetWeldingMethodList = () => get(`BaseInfo/GetWeldingMethod`)
 
+/**
+ * 按类型获取焊接耗材
+ * @param {number} consumablesType - 焊材类型：1焊丝，2焊条
+ */
+export const reqGetWeldingConsumables = (consumablesType) => get('BaseInfo/GetWeldingConsumables', { consumablesType })
+
 /**
  * 附件上传
  * @param {string} filePath   - 本地文件路径

api/hj.js

@@ -1,6 +1,7 @@
 import {
 	get,
-	post
+	post,
+	request
 } from '@/utils/request.js'
 
 /**
@@ -15,8 +16,18 @@ export const reqHJIndexData = (projectId) => get(`HJGLIndex/GetJGLIndexItem?proj
 export const reqGetWeldJointByWeldJointId = (id) => get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${id}`)
 
 /**
- * 焊接日报填报（提交时传 WeldTypeId / WeldingMethodId，后端同步更新焊口对应字段）
- * @param {Object} data - { WeldJointId, Personid, time, weldingLocation, welderType, WeldTypeId, WeldingMethodId, PreWeldAttachUrl, PostWeldAttachUrl }
+ * 搜索筛选焊口（下料/组对等中间页）
+ * @param {Object} params - { projectId, keyword?, pageIndex?, pageSize? }
+ */
+export const reqPipeJointWeldedJoints = (params = {}) => request('PipeJoint/GetWeldedJoints', {
+	method: 'GET',
+	data: params,
+	loading: false,
+})
+
+/**
+ * 焊接日报填报（提交时传 WeldTypeId/WeldTypeCode、WeldingMethodId/WeldingMethodCode，后端同步更新焊口对应字段）
+ * @param {Object} data - { WeldJointId, Personid, time, weldingLocation, welderType, WeldTypeId, WeldTypeCode, WeldingMethodId, WeldingMethodCode, WeldingWire, WeldingRod, PreWeldAttachUrl, PostWeldAttachUrl }
  */
 export const reqSaveWeldingDailyByWeldJointId = (data={}) => post(
 	`PreWeldingDaily/SaveWeldingDailyByWeldJointId`,data
@@ -205,8 +216,9 @@ export const reqGetAntiCorrosionCheck = (params = {}) => {
 // ========================= 日报审核 ====================================
 /**
  * 获取焊接日报待审核列表
- * @param {Object} params - { projectId, unitWorkId?, weldingDate?, pipelineCode?, welderCode?, pageIndex? }
- * pageIndex 从 1 开始，小于等于 0 时返回全部记录
+ * @param {Object} params - { projectId, unitWorkId?, weldingDate?, pipelineCode?, welderCode?, pageIndex?, pageSize? }
+ * pageIndex 从 1 开始；小于等于 0 时返回全部记录
+ * 响应 data.pageCount 为总记录数（不是总页数）
  */
 export const reqPendingWeldingDailyList = (params = {}) => get('/PreWeldingDaily/GetPendingWeldingDailyTempDetailList', params)
 
@@ -217,13 +229,19 @@ export const reqPendingWeldingDailyList = (params = {}) => get('/PreWeldingDaily
 export const reqPendingWeldingDailyDetail = (tempDetailId) => get(`/PreWeldingDaily/GetPendingWeldingDailyTempDetail?tempDetailId=${tempDetailId}`)
 
 /**
- * 批量审核通过焊接日报待审核明细
+ * 班组批量审核焊接日报待审核明细（状态 0 → 1）
+ * @param {Object} data - { TempDetailIds: string[], AuditMan: string }
+ */
+export const reqTeamAuditWeldingDaily = (data = {}) => post(`/PreWeldingDaily/TeamAuditPendingWeldingDailyTempDetails`, data)
+
+/**
+ * 专工批量审核焊接日报待审核明细（状态 1 → 2）
  * @param {Object} data - { TempDetailIds: string[], AuditMan: string }
  */
 export const reqAuditWeldingDaily = (data = {}) => post(`/PreWeldingDaily/AuditPendingWeldingDailyTempDetails`, data)
 
 /**
- * 批量删除（驳回）焊接日报待审核明细
+ * 批量删除未审核明细（仅状态 0）
  * @param {Object} data - { TempDetailIds: string[] }
  */
 export const reqDeleteWeldingDaily = (data = {}) => post(`/PreWeldingDaily/DeletePendingWeldingDailyTempDetails`, data)
@@ -243,7 +261,26 @@ export const reqWeldAppearanceJointDetail = (weldJointId) => get('/WeldAppearanc
 
 /**
  * 保存焊缝外观检测记录
- * @param {Object} data - { AppearanceCheckId?, ProjectId, WeldJointId, IsQualified, CheckPerson, CheckTime, Remark, AttachUrl, CreateUser }
+ * @param {Object} data - { AppearanceCheckId?, ProjectId, WeldJointId, IsQualified, CheckPerson, CheckTime, Remark, AttachUrl, CreateUser, WeldReinforcement, WeldHeight, WeldWidth, SurfaceDefect, PreheatTemperature, InterpassTemperature }
  */
 export const reqSaveWeldAppearanceCheck = (data = {}) => post('/WeldAppearanceCheck/SaveRecord', data)
 
+// ========================= 焊接任务单 ====================================
+/**
+ * 按班组查询任务单列表
+ * @param {Object} params - { projectId, teamGroupId?, unitWorkId? }
+ */
+export const reqWeldTaskListByTeamGroup = (params = {}) => get('WeldTask/GetTaskListByTeamGroup', params)
+
+/**
+ * 查询任务单详情（含 Joints）
+ * @param {Object} params - { projectId, taskCode, unitWorkId? }
+ */
+export const reqWeldTaskDetail = (params = {}) => get('WeldTask/GetTaskDetail', params)
+
+/**
+ * 根据任务单生成出库申请
+ * @param {Object} data - { ProjectId, TaskCode, PersonId }
+ */
+export const reqWeldTaskGenerateOutPlan = (data = {}) => post('WeldTask/GenerateOutPlan', data)
+