diff --git a/src/api/haianWarehouse/noOrderIssueNotify.js b/src/api/haianWarehouse/noOrderIssueNotify.js index b31c160..5cba563 100644 --- a/src/api/haianWarehouse/noOrderIssueNotify.js +++ b/src/api/haianWarehouse/noOrderIssueNotify.js @@ -20,7 +20,7 @@ export const saveSOIssueNotifyOrderList = (data) => createAPI('/autoWareHourceHa export const updateProductionArea = (data) => createAPI('/autoWareHourceHaian/haiAnIssureNotify/updateProductionArea', 'post', data) export const getFirstOrderListDetail = (data) => createAPI('/autoWareHourceHaian/haiAnIssureNotify/getFirstOrderListDetail', 'post', data) -// 海安查看页与推送占位接口：保持“推送留空”语义，不触发真实WCS主流程 - rqrq +// 海安无单查看页与WCS推送接口：预览和确认均走海安Search通用链路，由后端按site+notifyNo重新匹配 - rqrq export const searchNotifyMaterialListNew = (data) => createAPI('/autoWareHourceHaian/haiAnNewIssure/searchNotifyMaterialListNew', 'post', data) export const searchMaterialListDetail = (data) => createAPI('/autoWareHourceHaian/haiAnSearchIssureNotify/searchMaterialListDetail', 'post', data) export const updateNotifyStatusNew = (data) => createAPI('/autoWareHourceHaian/haiAnSearchIssureNotify/updateNotifyStatusNew', 'post', data) diff --git a/src/api/haianWarehouse/shipmentIssue.js b/src/api/haianWarehouse/shipmentIssue.js index 964c768..b6f157f 100644 --- a/src/api/haianWarehouse/shipmentIssue.js +++ b/src/api/haianWarehouse/shipmentIssue.js @@ -15,7 +15,7 @@ export const haiAnXiadaNotify = (data) => createAPI('/autoWareHourceHaian/haiAnI export const haiAnGetShipmentAndLineForIssure = (data) => createAPI('/autoWareHourceHaian/haiAnNewIssure/getShipmentAndLineForIssure', 'post', data) export const haiAnGetShipmentMaterialForIssure = (data) => createAPI('/autoWareHourceHaian/haiAnNewIssure/getShipmentMaterialForIssure', 'post', data) -// 海安销售发料查看页：统一走海安Search控制器，WCS仅保留占位接口 - rqrq +// 海安销售发料查看页：统一走海安Search控制器，WCS预览与推送由后端按site+notifyNo重新匹配 - rqrq export const haiAnSearchNotifyHeaderNew = (data) => createAPI('/autoWareHourceHaian/haiAnSearchIssureNotify/searchNotifyHeaderNew', 'post', data) export const haiAnSearchNotifyOrderListNew = (data) => createAPI('/autoWareHourceHaian/haiAnSearchIssureNotify/searchNotifyOrderListNew', 'post', data) export const haiAnSearchNotifyMaterialListNew = (data) => createAPI('/autoWareHourceHaian/haiAnSearchIssureNotify/searchNotifyMaterialListNew', 'post', data) diff --git a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue index b1cb019..f3e83fa 100644 --- a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue +++ b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue @@ -134,7 +134,8 @@ --> - + + - - - - - - - - - - - + + + 全数领料 --> - + + @@ -406,6 +410,7 @@ 新增批次指定 保存后按当前列表顺序进行指定匹配 +
@@ -450,7 +455,8 @@ - + + +
保存 关闭 @@ -2684,6 +2691,14 @@ export default { return String(value).replace(/(\.\d*?[1-9])0+$|\.0+$/, '$1') }, + /** + * 不可推送原因包含后端拼接的数量文本，展示时去除小数尾部无效0，避免现场误读缺料数量 - rqrq + */ + formatFailureMessage (message, fallback) { + const text = message || fallback || '' + return String(text).replace(/(-?\d+\.\d*?[1-9])0+(?!\d)/g, '$1').replace(/(-?\d+)\.0+(?!\d)/g, '$1') + }, + /** * 海安无单WCS确认推送：只提交site和notifyNo，实际订单和标签由服务端重新匹配决定 - rqrq */ diff --git a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue index 2dc571d..d2eedc7 100644 --- a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue @@ -161,9 +161,8 @@ style="width: 100px; height: 80px"/> - + - + - @@ -469,7 +467,7 @@ - + @@ -542,6 +540,19 @@
{{ scope.row.matchedSerialNos }}
 + + + 新增批次指定 保存后按当前列表顺序进行指定匹配 +
@@ -609,7 +621,8 @@ - + + +
保存 关闭 @@ -2124,18 +2138,18 @@ export default { }) return false } - + // 使用完整的行数据，只更新申请数量 let materialData = { ...this.editMaterialData, } - + // 确保申请数量不为空 if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) { materialData.qtyToIssue = 0 } - - + + updateMaterialDetail(materialData).then(({ data }) => { if (data.code === 0) { this.editMaterialModalFlag = false @@ -2485,14 +2499,21 @@ export default { if (row && row.matchStatus === 'MATCHED') classNames.push('success-row') return classNames.join(' ') }, - /** + /** * 数量展示去除无意义尾零，空值统一显示0 - rqrq */ formatPreviewQty (value) { if (value === null || value === undefined || value === '') return '0' return String(value).replace(/(\.\d*?[1-9])0+$|\.0+$/, '$1') }, - /** + /** + * 不可推送原因包含后端拼接的数量文本，展示时去除小数尾部无效0，避免现场误读缺料数量 - rqrq + */ + formatFailureMessage (message, fallback) { + const text = message || fallback || '' + return String(text).replace(/(-?\d+\.\d*?[1-9])0+(?!\d)/g, '$1').replace(/(-?\d+)\.0+(?!\d)/g, '$1') + }, + /** * 海安查看页确认推送：只提交site和notifyNo，实际订单和标签由服务端重新匹配决定 - rqrq */ pushToWCS () { diff --git a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue index 6408d00..22b137c 100644 --- a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue +++ b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue @@ -161,9 +161,8 @@ style="width: 100px; height: 80px"/> - + - + - @@ -469,7 +467,7 @@ - + @@ -542,6 +540,19 @@
{{ scope.row.matchedSerialNos }}
 + + + 新增批次指定 保存后按当前列表顺序进行指定匹配 +
@@ -609,7 +621,8 @@ - + + +
保存 关闭 @@ -2124,18 +2138,18 @@ export default { }) return false } - + // 使用完整的行数据，只更新申请数量 let materialData = { ...this.editMaterialData, } - + // 确保申请数量不为空 if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) { materialData.qtyToIssue = 0 } - - + + updateMaterialDetail(materialData).then(({ data }) => { if (data.code === 0) { this.editMaterialModalFlag = false @@ -2485,14 +2499,21 @@ export default { if (row && row.matchStatus === 'MATCHED') classNames.push('success-row') return classNames.join(' ') }, - /** + /** * 数量展示去除无意义尾零，空值统一显示0 - rqrq */ formatPreviewQty (value) { if (value === null || value === undefined || value === '') return '0' return String(value).replace(/(\.\d*?[1-9])0+$|\.0+$/, '$1') }, - /** + /** + * 不可推送原因包含后端拼接的数量文本，展示时去除小数尾部无效0，避免现场误读缺料数量 - rqrq + */ + formatFailureMessage (message, fallback) { + const text = message || fallback || '' + return String(text).replace(/(-?\d+\.\d*?[1-9])0+(?!\d)/g, '$1').replace(/(-?\d+)\.0+(?!\d)/g, '$1') + }, + /** * 海安查看页确认推送：只提交site和notifyNo，实际订单和标签由服务端重新匹配决定 - rqrq */ pushToWCS () { diff --git a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue index 044c3ad..51aed00 100644 --- a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue @@ -161,9 +161,8 @@ style="width: 100px; height: 80px"/> - + - + - @@ -469,7 +467,7 @@ - + @@ -542,6 +540,19 @@
{{ scope.row.matchedSerialNos }}
 + + + 新增批次指定 保存后按当前列表顺序进行指定匹配 +
@@ -609,7 +621,8 @@ - + + +
保存 关闭 @@ -2124,18 +2138,18 @@ export default { }) return false } - + // 使用完整的行数据，只更新申请数量 let materialData = { ...this.editMaterialData, } - + // 确保申请数量不为空 if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) { materialData.qtyToIssue = 0 } - - + + updateMaterialDetail(materialData).then(({ data }) => { if (data.code === 0) { this.editMaterialModalFlag = false @@ -2485,14 +2499,21 @@ export default { if (row && row.matchStatus === 'MATCHED') classNames.push('success-row') return classNames.join(' ') }, - /** + /** * 数量展示去除无意义尾零，空值统一显示0 - rqrq */ formatPreviewQty (value) { if (value === null || value === undefined || value === '') return '0' return String(value).replace(/(\.\d*?[1-9])0+$|\.0+$/, '$1') }, - /** + /** + * 不可推送原因包含后端拼接的数量文本，展示时去除小数尾部无效0，避免现场误读缺料数量 - rqrq + */ + formatFailureMessage (message, fallback) { + const text = message || fallback || '' + return String(text).replace(/(-?\d+\.\d*?[1-9])0+(?!\d)/g, '$1').replace(/(-?\d+)\.0+(?!\d)/g, '$1') + }, + /** * 海安查看页确认推送：只提交site和notifyNo，实际订单和标签由服务端重新匹配决定 - rqrq */ pushToWCS () { diff --git a/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue b/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue index 144303f..ddce4c6 100644 --- a/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue +++ b/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue @@ -63,7 +63,7 @@ - +