diff --git a/src/common/http.api.js b/src/common/http.api.js index f820d42..b28753f 100644 --- a/src/common/http.api.js +++ b/src/common/http.api.js @@ -26,6 +26,9 @@ const install = (Vue, vm) => { const FPM_PROCESS_IN_PREFIX = '/product/fpmProcessInOrder/'; const fpmProcessInUrl = (name) => getApiUrl() + FPM_PROCESS_IN_PREFIX + name; + const FPM_PROCESS_RETURN_IN_PREFIX = '/product/fpmProcessReturnInOrder/'; + const fpmProcessReturnInUrl = (name) => getApiUrl() + FPM_PROCESS_RETURN_IN_PREFIX + name; + const FPM_PROCESS_OUT_PREFIX = '/product/fpmProcessOutOrder/'; const fpmProcessOutUrl = (name) => getApiUrl() + FPM_PROCESS_OUT_PREFIX + name; @@ -71,6 +74,18 @@ const install = (Vue, vm) => { statusCancel: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrderStatusCancel'), params), }, + // 加工退货进仓单 + fpmProcessReturnInOrder: { + list: (params = {}) => vm.$u.get(fpmProcessReturnInUrl('getFpmProcessReturnInOrderList'), params), + detail: (params = {}) => vm.$u.get(fpmProcessReturnInUrl('getFpmProcessReturnInOrder'), params), + add: (params = {}) => vm.$u.postJson(fpmProcessReturnInUrl('addFpmProcessReturnInOrder'), params), + scanUpdate: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrder'), params), + statusPass: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusPass'), params), + statusWait: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusWait'), params), + statusReject: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusReject'), params), + statusCancel: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusCancel'), params), + }, + // 加工出仓单 fpmProcessOutOrder: { list: (params = {}) => vm.$u.get(fpmProcessOutUrl('getFpmProcessOutOrderList'), params), @@ -81,6 +96,8 @@ const install = (Vue, vm) => { statusWait: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusWait'), params), statusReject: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusReject'), params), statusCancel: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusCancel'), params), + /** 加工出仓类型枚举：正常加工出仓 / 回修加工出仓 */ + getOutTypeEnum: (params = {}) => vm.$u.get(getApiUrl() + '/product/enum/getProcessOutTypeTypeEnum', params), }, // 物理仓库下拉 diff --git a/src/common/storeGoodsProcessOut.js b/src/common/storeGoodsProcessOut.js index 28947b1..71e724a 100644 --- a/src/common/storeGoodsProcessOut.js +++ b/src/common/storeGoodsProcessOut.js @@ -28,9 +28,12 @@ export const ARRANGE_TYPE = { DEL: 3, }; -/** 出仓类型：正常加工出仓单 WarehouseGoodOutTypeProcess = 5 */ +/** 出仓类型：正常加工出仓 WarehouseGoodOutTypeProcess = 5 */ export const OUT_ORDER_TYPE_PROCESS = 5; -export const OUT_ORDER_TYPE_PROCESS_NAME = '正常加工出仓单'; +export const OUT_ORDER_TYPE_PROCESS_NAME = '正常加工出仓'; +/** 出仓类型：回修加工出仓 WarehouseGoodOutTypeProcessRepair = 8 */ +export const OUT_ORDER_TYPE_REPAIR = 8; +export const OUT_ORDER_TYPE_REPAIR_NAME = '回修加工出仓'; /** 往来单位类型：加工单位 */ export const BUSINESS_UNIT_TYPE_PROCESS = 12; @@ -333,6 +336,8 @@ export function getViewStatusActionButtons(status) { export function orderToFormFields(order) { return { order_no: order.order_no, + out_order_type: order.out_order_type || OUT_ORDER_TYPE_PROCESS, + out_order_type_name: order.out_order_type_name || OUT_ORDER_TYPE_PROCESS_NAME, process_unit_id: order.process_unit_id, process_name: order.process_name, warehouse_id: order.warehouse_id, diff --git a/src/common/storeGoodsProcessReturnIn.js b/src/common/storeGoodsProcessReturnIn.js new file mode 100644 index 0000000..486a4ca --- /dev/null +++ b/src/common/storeGoodsProcessReturnIn.js @@ -0,0 +1,375 @@ +/** + * 加工退货进仓单常量与数据工具 + * + * 真实接口请求统一注册在 src/common/http.api.js 的 vm.$u.api.fpmProcessReturnInOrder 下。 + */ +import dayjs from 'dayjs'; + +export const AUDIT_STATUS = { + PENDING: 1, + APPROVED: 2, + REJECTED: 3, + VOIDED: 4, +}; + +export const DRAFT_AUDIT_STATUS = 0; +export const DRAFT_AUDIT_STATUS_NAME = '待保存'; + +export const AUDIT_STATUS_MAP = { + 1: '待审核', + 2: '已审核', + 3: '已驳回', + 4: '已作废', +}; + +/** 操作类型：1录入 3删除 */ +export const ARRANGE_TYPE = { + IN: 1, + DEL: 3, +}; + +/** 入仓类型：加工退货进仓单 */ +export const IN_ORDER_TYPE_PROCESS_RETURN = 9; + +/** 往来单位类型：加工单位 */ +export const BUSINESS_UNIT_TYPE_PROCESS = 12; + +/** 成品物理仓类型 */ +export const WAREHOUSE_TYPE_FINISHED = 103; + +/** 默认仓库名称 */ +export const DEFAULT_WAREHOUSE_NAME = '成品仓'; + +export const LIST_PAGE_SIZE = 100; + +export const STATUS_ACTION_CONFIG = { + approve: { status: AUDIT_STATUS.APPROVED, msg: '确认审核该单据？', apiKey: 'statusPass' }, + void: { status: AUDIT_STATUS.VOIDED, msg: '确认作废该单据？', apiKey: 'statusCancel' }, + unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' }, +}; + +export function getStatusOptions() { + return Object.keys(AUDIT_STATUS_MAP).map((value) => ({ + value, + label: AUDIT_STATUS_MAP[value], + })); +} + +export function mapToSelectOptions(data) { + const list = Array.isArray(data) ? data : (data && (data.list || data.items || data.records)) || []; + return list.map((item) => ({ + value: item.id, + label: item.name || item.label || item.code || String(item.id), + })); +} + +/** 匹数：后端 ×100 存储 */ +export function formatRoll(value) { + const n = Number(value || 0) / 100; + return Number.isInteger(n) ? n : Number(n.toFixed(2)); +} + +/** 数量（公斤）：后端 ×10000 存储 */ +export function formatWeightKg(value) { + const n = Number(value || 0) / 10000; + return Number(n.toFixed(2)); +} + +export function normalizeOrder(order) { + if (!order) return null; + return { + id: order.id, + order_no: order.order_no || '', + audit_status: order.audit_status, + audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '', + process_unit_id: order.process_unit_id || order.biz_unit_id || '', + process_name: order.process_name || order.biz_unit_name || '', + warehouse_id: order.warehouse_id || '', + warehouse_name: order.warehouse_name || '', + sale_system_id: order.sale_system_id || '', + sale_system_name: order.sale_system_name || '', + in_order_type: order.in_order_type || IN_ORDER_TYPE_PROCESS_RETURN, + in_order_type_name: order.in_order_type_name || '加工退货进仓单', + remark: order.remark || '', + warehouse_in_time: (order.warehouse_in_time || '').slice(0, 10), + creator_name: order.creator_name || '', + create_time: order.create_time || '', + auditor_name: order.auditor_name || '', + audit_time: order.audit_time || '', + total_roll: formatRoll(order.total_roll), + total_weight: formatWeightKg(order.total_weight), + total_length: formatRoll(order.total_length), + item_data: (order.item_data || []).map(normalizeItem), + _raw: order, + }; +} + +export function normalizeFineCode(fc) { + if (!fc) return null; + const weightRaw = fc.base_unit_weight != null + ? fc.base_unit_weight + : (fc.settle_weight != null ? fc.settle_weight : fc.weight); + return { + id: fc.id, + volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '', + roll: formatRoll(fc.roll), + weight: formatWeightKg(weightRaw), + bar_code: fc.bar_code || '', + qr_code: fc.qr_code || '', + dye_factory_dyelot_number: fc.dye_factory_dyelot_number || fc.dyelot_number || '', + warehouse_bin_name: fc.warehouse_bin_name || '', + shelf_no: fc.shelf_no || '', + scan_code: fc.qr_code || fc.bar_code || '', + }; +} + +export function normalizeItem(item) { + return { + id: item.id, + quote_order_no: item.quote_order_no || '', + product_code: item.product_code || '', + product_name: item.product_name || '', + product_color_code: item.product_color_code || '', + product_color_name: item.product_color_name || '', + dye_factory_dyelot_number: item.dye_factory_dyelot_number || '', + dye_factory_color_code: item.dye_factory_color_code || '', + in_roll: formatRoll(item.in_roll), + in_weight: formatWeightKg(item.in_weight), + item_fc_data: (item.item_fc_data || []).map(normalizeFineCode).filter(Boolean), + }; +} + +/** + * 明细分组：成品编号 → 成品色号 → 细码 + */ +export function buildItemGroups(items) { + const productMap = new Map(); + (items || []).forEach((item) => { + const productKey = item.product_code || '-'; + if (!productMap.has(productKey)) { + productMap.set(productKey, { + group_key: `p:${productKey}`, + product_code: item.product_code || '', + product_name: item.product_name || '', + in_roll: 0, + in_weight: 0, + colors: new Map(), + }); + } + const productGroup = productMap.get(productKey); + if (!productGroup.product_name && item.product_name) { + productGroup.product_name = item.product_name; + } + + const colorKey = item.product_color_code || item.product_color_name || '-'; + if (!productGroup.colors.has(colorKey)) { + productGroup.colors.set(colorKey, { + group_key: `p:${productKey}|c:${colorKey}`, + product_color_code: item.product_color_code || '', + product_color_name: item.product_color_name || '', + quote_order_no: item.quote_order_no || '', + dye_factory_dyelot_number: item.dye_factory_dyelot_number || '', + in_roll: 0, + in_weight: 0, + fine_codes: [], + }); + } + const colorGroup = productGroup.colors.get(colorKey); + productGroup.in_roll = Number((productGroup.in_roll + Number(item.in_roll || 0)).toFixed(2)); + productGroup.in_weight = Number((productGroup.in_weight + Number(item.in_weight || 0)).toFixed(2)); + colorGroup.in_roll = Number((colorGroup.in_roll + Number(item.in_roll || 0)).toFixed(2)); + colorGroup.in_weight = Number((colorGroup.in_weight + Number(item.in_weight || 0)).toFixed(2)); + if (item.quote_order_no) colorGroup.quote_order_no = item.quote_order_no; + if (item.dye_factory_dyelot_number) { + colorGroup.dye_factory_dyelot_number = item.dye_factory_dyelot_number; + } + if (!colorGroup.product_color_name && item.product_color_name) { + colorGroup.product_color_name = item.product_color_name; + } + colorGroup.fine_codes.push(...(item.item_fc_data || [])); + }); + + return Array.from(productMap.values()).map((product) => ({ + group_key: product.group_key, + product_code: product.product_code, + product_name: product.product_name, + in_roll: product.in_roll, + in_weight: product.in_weight, + colors: Array.from(product.colors.values()), + })); +} + +export function getEmptyScanDetail() { + return { + quote_order_no: '', + dyelot_number: '', + volume_number: '', + product_code: '', + product_color_code: '', + order_roll: 0, + item_roll: 0, + order_weight: 0, + item_weight: 0, + }; +} + +/** 从扫码接口返回构建详情区（匹数÷100，数量÷10000） */ +export function buildScanDetailFromScanResponse(res) { + if (!res) return getEmptyScanDetail(); + return { + quote_order_no: res.quote_order_no || '', + dyelot_number: res.dyelot_number || '', + volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '', + product_code: res.product_code || '', + product_color_code: res.product_color_code || '', + order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), + item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll), + order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight), + item_weight: formatWeightKg(res.item_weight != null ? res.item_weight : res.weight), + }; +} + +/** 构建扫码请求参数 */ +export function buildScanUpdateParams({ id, scanCode, arrangeType, warehouseBinId }) { + const code = (scanCode || '').trim(); + const params = { + id: Number(id), + arrange_type: arrangeType, + }; + if (warehouseBinId) { + params.warehouse_bin_id = Number(warehouseBinId); + } + // 长度大于25走二维码，否则走条码 + if (code.length > 25) { + params.qr_code = code; + } else { + params.bar_code = code; + } + return params; +} + +export function buildStatusParam(id) { + return { id: String(id) }; +} + +export function formatDisplayTime(value, format = 'YYYY-MM-DD') { + if (!value) return ''; + const parsed = dayjs(value); + return parsed.isValid() ? parsed.format(format) : String(value).slice(0, 10); +} + +export function canScanAtStatus(status) { + return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status); +} + +export function isLockedOrderStatus(status) { + return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status); +} + +export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) { + const pickBatch = (res) => { + if (Array.isArray(res)) return res; + if (!res || typeof res !== 'object') return []; + return res.list || res.records || res.items || []; + }; + const loadPage = (page, acc) => listFn({ ...params, page, size: pageSize }) + .then((res) => { + const batch = pickBatch(res); + if (!batch.length) return acc; + // 一次返回超过 pageSize：后端忽略分页，视为全量，避免死循环翻页 + if (batch.length > pageSize) return acc.concat(batch); + // 翻页后与首页首条相同：后端忽略 page，避免死循环 + if ( + page > 1 + && acc.length + && batch[0] + && acc[0] + && String(batch[0].id) === String(acc[0].id) + ) { + return acc; + } + const merged = acc.concat(batch); + const total = !Array.isArray(res) && res != null ? Number(res.total) : NaN; + if (!Number.isNaN(total) && merged.length >= total) return merged; + if (batch.length < pageSize) return merged; + return loadPage(page + 1, merged); + }); + return loadPage(1, []); +} + +export function getFormStatusActionButtons(headerSaved, orderId, status) { + if (!headerSaved || !orderId || !canScanAtStatus(status)) return []; + return [ + { label: '审核', action: 'approve' }, + { label: '作废', action: 'void' }, + ]; +} + +export function getViewStatusActionButtons(status) { + if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) { + return [ + { label: '编辑', action: 'edit' }, + { label: '审核', action: 'approve' }, + { label: '作废', action: 'void' }, + ]; + } + if (status === AUDIT_STATUS.APPROVED) { + return [{ label: '消审', action: 'unapprove' }]; + } + return []; +} + +export function orderToFormFields(order) { + return { + order_no: order.order_no, + process_unit_id: order.process_unit_id, + process_name: order.process_name, + warehouse_id: order.warehouse_id, + warehouse_name: order.warehouse_name, + remark: order.remark, + item_data: order.item_data, + }; +} + +/** 从仓库下拉中选出默认成品仓 */ +export function pickDefaultWarehouse(options, loginWarehouseId, loginWarehouseName) { + const list = options || []; + const byName = list.find((item) => item.label === DEFAULT_WAREHOUSE_NAME); + if (byName) return byName; + if (loginWarehouseId) { + const byId = list.find((item) => String(item.value) === String(loginWarehouseId)); + if (byId) return byId; + if (loginWarehouseName) { + return { value: loginWarehouseId, label: loginWarehouseName }; + } + } + return list[0] || null; +} + +/** + * 确认并执行审核状态变更 + */ +export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) { + const cfg = STATUS_ACTION_CONFIG[action]; + if (!cfg || !orderId) return; + const api = vm.$u.api.fpmProcessReturnInOrder; + const requestFn = api[cfg.apiKey]; + if (typeof requestFn !== 'function') return; + uni.showModal({ + title: '提示', + content: cfg.msg, + success: (res) => { + if (!res.confirm) return; + uni.showLoading({ title: '处理中...' }); + requestFn(buildStatusParam(orderId)) + .then(() => { + if (typeof onSuccess === 'function') return onSuccess(); + uni.hideLoading(); + }) + .catch((e) => { + uni.hideLoading(); + if (vm.showError) vm.showError(e.message || '操作失败'); + }); + }, + }); +} diff --git a/src/components/card/storeGoodsProcessOutItem.vue b/src/components/card/storeGoodsProcessOutItem.vue index eedbd8f..0fd814f 100644 --- a/src/components/card/storeGoodsProcessOutItem.vue +++ b/src/components/card/storeGoodsProcessOutItem.vue @@ -4,6 +4,10 @@ {{ item.order_no }} {{ item.audit_status_name }} + + 出仓类型： + {{ item.out_order_type_name || '-' }} + 加工单位： {{ item.process_name || '-' }} diff --git a/src/components/card/storeGoodsProcessReturnInItem.vue b/src/components/card/storeGoodsProcessReturnInItem.vue new file mode 100644 index 0000000..eef6d01 --- /dev/null +++ b/src/components/card/storeGoodsProcessReturnInItem.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/components/storegoods/ProcessInDetailList.vue b/src/components/storegoods/ProcessInDetailList.vue index b7f6af7..107e403 100644 --- a/src/components/storegoods/ProcessInDetailList.vue +++ b/src/components/storegoods/ProcessInDetailList.vue @@ -16,8 +16,7 @@ > - {{ product.product_code || '-' }} - {{ product.product_name }} + {{ product.product_code || '-' }}{{ ' ' + product.product_name }} 匹数 {{ product.in_roll }} / 数量 {{ product.in_weight }} @@ -31,10 +30,7 @@ > - 色号 {{ color.product_color_code || '-' }} - - {{ color.product_color_name }} - + 色号 {{ color.product_color_code || '-' }}{{ ' ' + color.product_color_name }} 匹数 {{ color.in_roll }} / 数量 {{ color.in_weight }} @@ -89,7 +85,6 @@ const FINE_COLUMNS = [ { label: '卷号', key: 'volume_number', width: 90 }, { label: '匹数', key: 'roll', width: 90 }, { label: '数量', key: 'weight', width: 110 }, - { label: '条码', key: 'bar_code', width: 220 }, { label: '仓位', key: 'warehouse_bin_name', width: 120 }, { label: '缸号', key: 'dye_factory_dyelot_number', width: 140 }, ]; diff --git a/src/components/storegoods/ProcessOutDetailList.vue b/src/components/storegoods/ProcessOutDetailList.vue index 1e51184..524c0c2 100644 --- a/src/components/storegoods/ProcessOutDetailList.vue +++ b/src/components/storegoods/ProcessOutDetailList.vue @@ -16,8 +16,7 @@ > - {{ product.product_code || '-' }} - {{ product.product_name }} + {{ product.product_code || '-' }}{{ ' ' + product.product_name }} 匹数 {{ product.out_roll }} / 数量 {{ product.out_weight }} @@ -31,10 +30,7 @@ > - 色号 {{ color.product_color_code || '-' }} - - {{ color.product_color_name }} - + 色号 {{ color.product_color_code || '-' }}{{ ' ' + color.product_color_name }} 匹数 {{ color.out_roll }} / 数量 {{ color.out_weight }} diff --git a/src/pages.json b/src/pages.json index 1a13666..f876213 100644 --- a/src/pages.json +++ b/src/pages.json @@ -449,6 +449,34 @@ "navigationBarTitleText": "查看加工进仓单", "enablePullDownRefresh": false } + },{ + "path" : "pages/storegoods/storeGoodsProcessReturnInList", + "style" : + { + "navigationBarTitleText": "加工退货进仓列表", + "enablePullDownRefresh": false + } + },{ + "path" : "pages/storegoods/storeGoodsProcessReturnInAdd", + "style" : + { + "navigationBarTitleText": "新增加工退货进仓单", + "enablePullDownRefresh": false + } + },{ + "path" : "pages/storegoods/storeGoodsProcessReturnInEdit", + "style" : + { + "navigationBarTitleText": "编辑加工退货进仓单", + "enablePullDownRefresh": false + } + },{ + "path" : "pages/storegoods/storeGoodsProcessReturnInView", + "style" : + { + "navigationBarTitleText": "查看加工退货进仓单", + "enablePullDownRefresh": false + } },{ "path" : "pages/storegoods/storeGoodsProcessOutList", "style" : diff --git a/src/pages/storegoods/storeGoodsProcessInList.vue b/src/pages/storegoods/storeGoodsProcessInList.vue index 486cdb3..128b3ce 100644 --- a/src/pages/storegoods/storeGoodsProcessInList.vue +++ b/src/pages/storegoods/storeGoodsProcessInList.vue @@ -225,7 +225,10 @@ export default { this.loadList(); }, goView(item) { - uni.navigateTo({ url: `./storeGoodsProcessInView?id=${item.id}` }); + const page = Number(item.audit_status) === 1 + ? 'storeGoodsProcessInEdit' + : 'storeGoodsProcessInView'; + uni.navigateTo({ url: `./${page}?id=${item.id}` }); }, openStatusSelect() { this.statusSelectShow = true; }, onStatusConfirm(e) { this.filters.audit_status = e[0].value; }, diff --git a/src/pages/storegoods/storeGoodsProcessOutAdd.vue b/src/pages/storegoods/storeGoodsProcessOutAdd.vue index a69ee0d..bdbf79d 100644 --- a/src/pages/storegoods/storeGoodsProcessOutAdd.vue +++ b/src/pages/storegoods/storeGoodsProcessOutAdd.vue @@ -6,9 +6,12 @@ 出仓单号 - - 出仓类型 - 正常加工出仓单 + + 出仓类型* + + {{ form.out_order_type_name || '请选择' }} + + 加工单位* diff --git a/src/pages/storegoods/storeGoodsProcessOutEdit.vue b/src/pages/storegoods/storeGoodsProcessOutEdit.vue index ce132c7..68a0451 100644 --- a/src/pages/storegoods/storeGoodsProcessOutEdit.vue +++ b/src/pages/storegoods/storeGoodsProcessOutEdit.vue @@ -8,7 +8,7 @@ 出仓类型 - 正常加工出仓单 + {{ form.out_order_type_name || '正常加工出仓' }} 加工单位 diff --git a/src/pages/storegoods/storeGoodsProcessOutList.vue b/src/pages/storegoods/storeGoodsProcessOutList.vue index c7ae6b1..bfe1d58 100644 --- a/src/pages/storegoods/storeGoodsProcessOutList.vue +++ b/src/pages/storegoods/storeGoodsProcessOutList.vue @@ -207,6 +207,8 @@ export default { return { id: order.id, order_no: order.order_no || '', + out_order_type: order.out_order_type || '', + out_order_type_name: order.out_order_type_name || '', process_unit_id: order.process_unit_id || '', process_name: order.process_name || '', warehouse_id: order.warehouse_id || '', @@ -225,7 +227,10 @@ export default { this.loadList(); }, goView(item) { - uni.navigateTo({ url: `./storeGoodsProcessOutView?id=${item.id}` }); + const page = Number(item.audit_status) === 1 + ? 'storeGoodsProcessOutEdit' + : 'storeGoodsProcessOutView'; + uni.navigateTo({ url: `./${page}?id=${item.id}` }); }, openStatusSelect() { this.statusSelectShow = true; }, onStatusConfirm(e) { this.filters.audit_status = e[0].value; }, diff --git a/src/pages/storegoods/storeGoodsProcessOutMixin.js b/src/pages/storegoods/storeGoodsProcessOutMixin.js index c5128c4..77aa0f5 100644 --- a/src/pages/storegoods/storeGoodsProcessOutMixin.js +++ b/src/pages/storegoods/storeGoodsProcessOutMixin.js @@ -14,6 +14,7 @@ import { BUSINESS_UNIT_TYPE_PROCESS, WAREHOUSE_TYPE_FINISHED, OUT_ORDER_TYPE_PROCESS, + OUT_ORDER_TYPE_PROCESS_NAME, normalizeOrder, mapToSelectOptions, canScanAtStatus, @@ -49,6 +50,7 @@ export default { auditStatus: 0, processUnitOptions: [], warehouseOptions: [], + outOrderTypeOptions: [], dropdownLoading: false, /** 手机连续扫码开关：成功后自动再调起；取消/失败则关闭 */ phoneContinuousScan: false, @@ -156,6 +158,10 @@ export default { if (this.dropdownLoading) return Promise.resolve(); this.dropdownLoading = true; return Promise.all([ + this.ensureOutOrderTypeOptions().catch((e) => { + console.error('加载出仓类型失败', e); + return []; + }), this.ensureProcessUnitOptions().catch((e) => { console.error('加载加工单位失败', e); return []; @@ -168,6 +174,24 @@ export default { this.dropdownLoading = false; }); }, + ensureOutOrderTypeOptions() { + if (this.outOrderTypeOptions.length) return Promise.resolve(this.outOrderTypeOptions); + return this.$u.api.fpmProcessOutOrder.getOutTypeEnum() + .then((res) => { + this.outOrderTypeOptions = mapToSelectOptions(res); + if (this.headerEditable && !this.form.out_order_type) { + this.applyDefaultOutOrderType(); + } + return this.outOrderTypeOptions; + }); + }, + applyDefaultOutOrderType() { + const list = this.outOrderTypeOptions || []; + const preferred = list.find((item) => Number(item.value) === OUT_ORDER_TYPE_PROCESS) || list[0]; + if (!preferred) return; + this.form.out_order_type = preferred.value; + this.form.out_order_type_name = preferred.label; + }, ensureProcessUnitOptions() { if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions); return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }) @@ -201,6 +225,8 @@ export default { getEmptyForm() { return { order_no: '', + out_order_type: OUT_ORDER_TYPE_PROCESS, + out_order_type_name: OUT_ORDER_TYPE_PROCESS_NAME, process_unit_id: '', process_name: '', warehouse_id: '', @@ -247,7 +273,11 @@ export default { this.selectList = list; this.selectShow = true; }; - if (type === '加工单位') { + if (type === '出仓类型') { + this.ensureOutOrderTypeOptions() + .then(openPicker) + .catch((e) => this.showError(e.message || '加载出仓类型失败')); + } else if (type === '加工单位') { this.ensureProcessUnitOptions() .then(openPicker) .catch((e) => this.showError(e.message || '加载加工单位失败')); @@ -259,7 +289,10 @@ export default { }, selectConfirmFun(e) { const item = e[0]; - if (this.selectType === '加工单位') { + if (this.selectType === '出仓类型') { + this.form.out_order_type = item.value; + this.form.out_order_type_name = item.label; + } else if (this.selectType === '加工单位') { this.form.process_unit_id = item.value; this.form.process_name = item.label; } else if (this.selectType === '仓库名称') { @@ -268,6 +301,7 @@ export default { } }, validateForm() { + if (!this.form.out_order_type) return '请选择出仓类型'; if (!this.form.process_unit_id) return '请选择加工单位'; if (!this.form.warehouse_id) return '请选择仓库名称'; const app = getApp(); @@ -279,7 +313,7 @@ export default { const app = getApp(); return { // OpenAPI: product.AddFpmProcessOutOrderParam - out_order_type: OUT_ORDER_TYPE_PROCESS, // WarehouseGoodOutTypeProcess = 5 + out_order_type: Number(this.form.out_order_type), process_unit_id: Number(this.form.process_unit_id), warehouse_id: Number(this.form.warehouse_id), sale_system_id: Number(app.globalData.PlanDepartmentID), diff --git a/src/pages/storegoods/storeGoodsProcessOutView.vue b/src/pages/storegoods/storeGoodsProcessOutView.vue index b8e5b7c..533d0aa 100644 --- a/src/pages/storegoods/storeGoodsProcessOutView.vue +++ b/src/pages/storegoods/storeGoodsProcessOutView.vue @@ -8,7 +8,7 @@ 出仓类型 - {{ order.out_order_type_name || '正常加工出仓单' }} + {{ order.out_order_type_name || '正常加工出仓' }} 加工单位 diff --git a/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue b/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue new file mode 100644 index 0000000..2ea976a --- /dev/null +++ b/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue b/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue new file mode 100644 index 0000000..9b792dd --- /dev/null +++ b/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/pages/storegoods/storeGoodsProcessReturnInList.vue b/src/pages/storegoods/storeGoodsProcessReturnInList.vue new file mode 100644 index 0000000..0f24254 --- /dev/null +++ b/src/pages/storegoods/storeGoodsProcessReturnInList.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js new file mode 100644 index 0000000..700f70e --- /dev/null +++ b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js @@ -0,0 +1,535 @@ +/** + * 加工退货进仓单表单 mixin（新增/编辑共用） + * + * 1. 先填表头（加工单位 / 仓库 / 备注）提交 add，拿到 id 后可扫码 + * 2. 先扫仓位（getWarehouseBin：传 qr_code + warehouse_id），校验后扫布匹二维码 + * 3. 扫码走 updateFpmProcessReturnInOrder（arrange_type: 1 录入 / 3 删除，带 warehouse_bin_id） + * 4. 手机扫码成功展示详情后自动再次调起扫码，形成连续扫 + */ +import util from '@/common/util'; +import scanMixin from '@/common/scanMixin.js'; +import { initTts, speak } from '@/common/tts.js'; +import { + AUDIT_STATUS_MAP, + ARRANGE_TYPE, + BUSINESS_UNIT_TYPE_PROCESS, + WAREHOUSE_TYPE_FINISHED, + IN_ORDER_TYPE_PROCESS_RETURN, + normalizeOrder, + mapToSelectOptions, + canScanAtStatus, + isLockedOrderStatus, + getFormStatusActionButtons, + orderToFormFields, + confirmOrderStatusAction, + DRAFT_AUDIT_STATUS, + DRAFT_AUDIT_STATUS_NAME, + getEmptyScanDetail, + buildScanDetailFromScanResponse, + buildScanUpdateParams, + pickDefaultWarehouse, +} from '@/common/storeGoodsProcessReturnIn'; + +export default { + mixins: [scanMixin], + data() { + return { + pageMode: 'add', + orderId: 0, + form: this.getEmptyForm(), + headerSaved: false, + selectShow: false, + selectList: [], + selectType: '', + canScan: false, + QRBarCode: '', + BarCodeDelStatus: false, + BillDataMessage: '', + scanDetail: getEmptyScanDetail(), + auditStatus: 0, + processUnitOptions: [], + warehouseOptions: [], + dropdownLoading: false, + /** 仓位 */ + warehouseBinId: 0, + warehouseBinCode: '', + warehouseBinName: '', + /** 手机连续扫码开关：成功后自动再调起；取消/失败则关闭 */ + phoneContinuousScan: false, + /** 手机扫当前目标：bin | qr */ + phoneScanTarget: 'bin', + }; + }, + computed: { + isReadonly() { + return this.pageMode === 'view'; + }, + isEditable() { + return this.pageMode === 'add' || this.pageMode === 'edit'; + }, + headerEditable() { + return this.pageMode === 'add' && !this.headerSaved; + }, + statusActionButtons() { + return getFormStatusActionButtons(this.headerSaved, this.orderId, this.auditStatus); + }, + displayAuditStatus() { + if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS; + return this.auditStatus; + }, + displayAuditStatusName() { + if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS_NAME; + return AUDIT_STATUS_MAP[this.auditStatus] || ''; + }, + /** 录入需先选仓位；删除模式仅需单据可扫 */ + canScanQr() { + if (!this.canScan) return false; + if (this.BarCodeDelStatus) return true; + return !!this.warehouseBinId; + }, + /** 扫码栏在可扫状态下始终展示（含删除勾选） */ + showQrScanBar() { + return this.canScan; + }, + qrDisabledTip() { + if (!this.canScan) return '请先提交保存后再扫码'; + if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码'; + return '当前状态不可扫码'; + }, + }, + onShow() { + this.isPageActive = true; + initTts(); + if (this.canScan && this.isEditable) { + this.registerOrderScanBroadcast(); + } + }, + onHide() { + this.isPageActive = false; + this.phoneContinuousScan = false; + this.unregisterScanBroadcast(); + }, + onUnload() { + this.isPageActive = false; + this.phoneContinuousScan = false; + this.unregisterScanBroadcast(); + }, + methods: { + clearWarehouseBin() { + this.warehouseBinId = 0; + this.warehouseBinCode = ''; + this.warehouseBinName = ''; + this.phoneContinuousScan = false; + }, + handleBinPhoneScan() { + if (!this.canScan || !this.orderId) { + this.showError('请先提交保存后再扫码'); + return; + } + this.phoneContinuousScan = false; + this.phoneScanTarget = 'bin'; + this.openPhoneScan({ + callback: (scanResult) => { + this.warehouseBinCode = String(scanResult || '').trim().replace(/[\r\n]/g, ''); + this.$nextTick(() => this.resolveWarehouseBin()); + }, + fail: () => {}, + }); + }, + handlePhoneScan() { + if (!this.canScan || !this.orderId) { + this.showError('请先提交保存后再扫码'); + return; + } + // 删除模式可直接扫布匹码；录入模式无仓位时先扫仓位 + if (!this.BarCodeDelStatus && !this.warehouseBinId) { + this.handleBinPhoneScan(); + return; + } + this.phoneScanTarget = 'qr'; + this.phoneContinuousScan = true; + this.openContinuousPhoneScan(); + }, + openContinuousPhoneScan() { + if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) { + this.phoneContinuousScan = false; + return; + } + this.openPhoneScan({ + callback: (scanResult) => { + this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, ''); + this.$nextTick(() => this.handleScan({ fromPhone: true })); + }, + fail: () => { + this.phoneContinuousScan = false; + }, + }); + }, + scheduleNextPhoneScan() { + if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) { + this.phoneContinuousScan = false; + return; + } + setTimeout(() => { + this.openContinuousPhoneScan(); + }, 400); + }, + registerOrderScanBroadcast() { + this.registerScanBroadcast((scanResult) => { + const code = String(scanResult || '').trim().replace(/[\r\n]/g, ''); + if (!code) return; + // 删除模式：直接按布匹码删除；未扫仓位时枪扫优先解析为仓位 + if (!this.BarCodeDelStatus && !this.warehouseBinId) { + this.warehouseBinCode = code; + this.$nextTick(() => this.resolveWarehouseBin()); + return; + } + this.QRBarCode = code; + this.$nextTick(() => this.handleScan()); + }); + }, + resolveWarehouseBin() { + const code = (this.warehouseBinCode || '').trim(); + if (!this.canScan || !this.orderId) { + this.showError('请先提交保存后再扫码'); + return; + } + if (!code) return; + if (!this.form.warehouse_id) { + this.showError('单据缺少仓库信息'); + return; + } + uni.showLoading({ title: '识别仓位...' }); + return this.$u.api.warehouseBin.getByQrCode({ + qr_code: code, + warehouse_id: Number(this.form.warehouse_id), + }) + .then((data) => { + uni.hideLoading(); + if (!data || !data.id) { + throw new Error('未识别到仓位'); + } + // 返回 physical_warehouse_id，与单据仓库校验 + if ( + data.physical_warehouse_id + && String(data.physical_warehouse_id) !== String(this.form.warehouse_id) + ) { + this.warehouseBinId = 0; + this.warehouseBinName = ''; + throw new Error('该仓位不属于当前仓库'); + } + this.warehouseBinId = data.id; + this.warehouseBinCode = data.code || data.qr_code || code; + this.warehouseBinName = data.name || ''; + this.BillDataMessage = ''; + speak('仓位成功'); + uni.showToast({ title: '仓位识别成功', icon: 'success' }); + }) + .catch((e) => { + uni.hideLoading(); + this.warehouseBinId = 0; + this.warehouseBinName = ''; + this.showError(e.message || '仓位识别失败'); + }); + }, + syncCanScanFromStatus(status) { + const nextCanScan = this.isEditable && canScanAtStatus(status); + if (this.canScan && !nextCanScan) { + this.phoneContinuousScan = false; + this.unregisterScanBroadcast(); + } + this.canScan = nextCanScan; + }, + loadBaseDropdowns() { + if (this.dropdownLoading) return Promise.resolve(); + this.dropdownLoading = true; + return Promise.all([ + this.ensureProcessUnitOptions().catch((e) => { + console.error('加载加工单位失败', e); + return []; + }), + this.ensureWarehouseOptions().catch((e) => { + console.error('加载仓库失败', e); + return []; + }), + ]).finally(() => { + this.dropdownLoading = false; + }); + }, + ensureProcessUnitOptions() { + if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions); + return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }) + .then((res) => { + this.processUnitOptions = mapToSelectOptions(res); + return this.processUnitOptions; + }); + }, + ensureWarehouseOptions() { + if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions); + return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }) + .then((res) => { + this.warehouseOptions = mapToSelectOptions(res); + if (this.headerEditable && !this.form.warehouse_id) { + this.applyDefaultWarehouse(); + } + return this.warehouseOptions; + }); + }, + applyDefaultWarehouse() { + const app = getApp(); + const picked = pickDefaultWarehouse( + this.warehouseOptions, + app && app.globalData ? app.globalData.StoreNameID : '', + app && app.globalData ? app.globalData.StoreName : '', + ); + if (!picked) return; + this.form.warehouse_id = picked.value; + this.form.warehouse_name = picked.label; + }, + getEmptyForm() { + return { + order_no: '', + process_unit_id: '', + process_name: '', + warehouse_id: '', + warehouse_name: '', + remark: '', + item_data: [], + }; + }, + loadOrder(id, options = {}) { + const { rejectIfLocked = false } = options; + return this.$u.api.fpmProcessReturnInOrder.detail({ id }) + .then((res) => { + const order = normalizeOrder(res); + if (!order) { + this.showError('单据不存在'); + return null; + } + if (rejectIfLocked && isLockedOrderStatus(order.audit_status)) { + this.showError('当前状态不可编辑'); + setTimeout(() => uni.navigateBack(), 1500); + return null; + } + this.orderId = order.id; + this.auditStatus = order.audit_status; + this.headerSaved = true; + this.form = orderToFormFields(order); + this.clearWarehouseBin(); + this.syncCanScanFromStatus(order.audit_status); + if (this.canScan) this.registerOrderScanBroadcast(); + return order; + }) + .catch((e) => { + this.showError(e.message || '加载单据失败'); + return null; + }); + }, + pickerSelectFun(type) { + if (!this.headerEditable) return; + this.selectType = type; + const openPicker = (list) => { + if (!list.length) { + this.showError('暂无可选数据'); + return; + } + this.selectList = list; + this.selectShow = true; + }; + if (type === '加工单位') { + this.ensureProcessUnitOptions() + .then(openPicker) + .catch((e) => this.showError(e.message || '加载加工单位失败')); + } else if (type === '仓库名称') { + this.ensureWarehouseOptions() + .then(openPicker) + .catch((e) => this.showError(e.message || '加载仓库失败')); + } + }, + selectConfirmFun(e) { + const item = e[0]; + if (this.selectType === '加工单位') { + this.form.process_unit_id = item.value; + this.form.process_name = item.label; + } else if (this.selectType === '仓库名称') { + this.form.warehouse_id = item.value; + this.form.warehouse_name = item.label; + } + }, + validateForm() { + if (!this.form.process_unit_id) return '请选择加工单位'; + if (!this.form.warehouse_id) return '请选择仓库名称'; + const app = getApp(); + const saleSystemId = app && app.globalData ? app.globalData.PlanDepartmentID : ''; + if (!saleSystemId) return '缺少营销体系，请重新登录'; + return ''; + }, + buildAddParam() { + const app = getApp(); + return { + inOrderType: IN_ORDER_TYPE_PROCESS_RETURN, + biz_unit_id: Number(this.form.process_unit_id), + warehouse_id: Number(this.form.warehouse_id), + sale_system_id: Number(app.globalData.PlanDepartmentID), + remark: this.form.remark || '', + item_data: [], + }; + }, + submitSave() { + if (this.headerSaved) { + this.showError('表头已保存，请直接扫码'); + return; + } + const err = this.validateForm(); + if (err) { + this.showError(err); + return; + } + uni.showLoading({ title: '保存中...' }); + this.$u.api.fpmProcessReturnInOrder.add(this.buildAddParam()) + .then((res) => { + this.orderId = (res && res.id) || 0; + if (!this.orderId) { + throw new Error('保存失败，未返回单据ID'); + } + return this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId }); + }) + .then((detail) => { + uni.hideLoading(); + const order = normalizeOrder(detail); + this.applyOrder(order); + this.headerSaved = true; + this.clearWarehouseBin(); + this.syncCanScanFromStatus(order.audit_status); + this.showSuccess('保存成功，请先扫描仓位'); + this.registerOrderScanBroadcast(); + }) + .catch((e) => { + uni.hideLoading(); + this.showError(e.message || '保存失败'); + }); + }, + applyOrder(order) { + if (!order) return; + this.auditStatus = order.audit_status; + Object.assign(this.form, orderToFormFields(order)); + }, + handleScan(options = {}) { + const fromPhone = !!options.fromPhone; + const code = (this.QRBarCode || '').trim(); + if (!this.canScan || !this.orderId) { + this.showError('请先提交保存后再扫码'); + this.QRBarCode = ''; + this.phoneContinuousScan = false; + return; + } + const isDelete = this.BarCodeDelStatus; + if (!isDelete && !this.warehouseBinId) { + this.showError('请先扫描仓位'); + this.QRBarCode = ''; + this.phoneContinuousScan = false; + return; + } + if (!code) { + this.QRBarCode = ''; + if (fromPhone) this.scheduleNextPhoneScan(); + return; + } + const arrangeType = isDelete ? ARRANGE_TYPE.DEL : ARRANGE_TYPE.IN; + this.doScanUpdate(code, arrangeType, { fromPhone }); + }, + BarCodeDelChange(e) { + this.BarCodeDelStatus = (e.detail.value || []).length > 0; + this.BillDataMessage = this.BarCodeDelStatus ? '删除模式：扫描细码即可删除' : ''; + }, + getFineCodeScanCode(fineCode) { + if (!fineCode) return ''; + return fineCode.qr_code || fineCode.scan_code || fineCode.bar_code || ''; + }, + onDeleteFineCode(fineCode) { + if (!this.canScan || !this.orderId) { + this.showError('当前状态不可删除'); + return; + } + const scanCode = this.getFineCodeScanCode(fineCode); + if (!scanCode) { + this.showError('该细码缺少条码，无法删除'); + return; + } + uni.showModal({ + title: '提示', + content: `确认删除细码 ${scanCode}？`, + success: (res) => { + if (!res.confirm) return; + this.doScanUpdate(scanCode, ARRANGE_TYPE.DEL); + }, + }); + }, + doScanUpdate(scanCode, arrangeType, options = {}) { + const { fromPhone = false } = options; + const isDelete = arrangeType === ARRANGE_TYPE.DEL; + uni.showLoading({ title: isDelete ? '删除中...' : '处理中...' }); + return this.$u.api.fpmProcessReturnInOrder.scanUpdate(buildScanUpdateParams({ + id: this.orderId, + scanCode, + arrangeType, + // 删除不强制仓位；录入带当前仓位 + warehouseBinId: isDelete ? 0 : this.warehouseBinId, + })) + .then((scanRes) => { + this.scanDetail = buildScanDetailFromScanResponse(scanRes); + this.BillDataMessage = isDelete ? '删除成功' : '扫描成功'; + this.QRBarCode = ''; + if (isDelete) { + speak('已删除'); + uni.showToast({ title: '删除成功', icon: 'success' }); + } else { + speak('成功'); + } + return this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId }) + .then((detail) => { + const order = normalizeOrder(detail); + if (order) { + this.form.item_data = order.item_data; + this.auditStatus = order.audit_status; + } + }) + .catch(() => null); + }) + .then(() => { + uni.hideLoading(); + if (fromPhone) this.scheduleNextPhoneScan(); + }) + .catch((e) => { + uni.hideLoading(); + this.phoneContinuousScan = false; + const message = e.message || (isDelete ? '删除失败' : '扫码失败'); + this.showError(message); + this.QRBarCode = ''; + }); + }, + handleStatusAction(action) { + confirmOrderStatusAction(this, { + orderId: this.orderId, + action, + onSuccess: () => this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId }) + .then((detail) => { + uni.hideLoading(); + const order = normalizeOrder(detail); + if (!order) return; + this.applyOrder(order); + this.syncCanScanFromStatus(order.audit_status); + this.showSuccess('操作成功'); + }), + }); + }, + showError(message) { + util.playErrorAudio(); + uni.showModal({ title: '提示', content: message, showCancel: false }); + }, + showSuccess(message) { + util.playSuccessAudio(); + uni.showToast({ title: message, icon: 'success' }); + }, + }, +}; diff --git a/src/pages/storegoods/storeGoodsProcessReturnInView.vue b/src/pages/storegoods/storeGoodsProcessReturnInView.vue new file mode 100644 index 0000000..6a637c0 --- /dev/null +++ b/src/pages/storegoods/storeGoodsProcessReturnInView.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/pages/sys/workbench/index.vue b/src/pages/sys/workbench/index.vue index c87c2fb..ea577e0 100644 --- a/src/pages/sys/workbench/index.vue +++ b/src/pages/sys/workbench/index.vue @@ -39,6 +39,12 @@ 加工出仓 + + + + + 加工退货进仓 +