-
-
上一页
- {{ functionTitle }}
- 🏠首页
+
+
+
-
-
+
+ 委外发料
-
-
-
-
\ No newline at end of file
diff --git a/src/views/modules/outsourcing-issue/outsourcingPicking.vue b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
new file mode 100644
index 0000000..c88dcc6
--- /dev/null
+++ b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
@@ -0,0 +1,402 @@
+
+
-
-
-
-
-
- 直接发料
- 输入委外订单号，扫描物料标签直接发料
-
-
-
- 拣选装托盘
- 基于申请单创建托盘，扫描箱卷绑定
-
-
-
- 移库发料
- 输入申请单/PO号，选择库位，生成移库记录
-
-
-
- 退料
- 选择退料类型，录入退料数量，生成退料记录
-
-
-
-
-
-
-
-
+
+
+
首页
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/outsourcing-issue/outsourcingPickingDetail.vue b/src/views/modules/outsourcing-issue/outsourcingPickingDetail.vue
new file mode 100644
index 0000000..4d8e49e
--- /dev/null
+++ b/src/views/modules/outsourcing-issue/outsourcingPickingDetail.vue
@@ -0,0 +1,1030 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 委外订单号
+ {{ item.outsourcingNo }}
+
+
+
+
+
+
+ 申请单号
+ {{ item.requestNo }}
+
+
+ 标签张数
+
+ {{ item.pickedLabels }}{{ item.totalLabels }}
+
+
+
+ 物料总数
+
+ {{ item.requestQty }}{{ item.remainQty }}
+
+
+
+
+
+
+ 暂无待发料委外订单
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/outsourcing-issue/pick.vue b/src/views/modules/outsourcing-issue/pick.vue
deleted file mode 100644
index 1a976d2..0000000
--- a/src/views/modules/outsourcing-issue/pick.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-
-
+
+
+
+
+
+
+ {{ '移除' }}
+ {{ '添加' }}
+
+
+
+
+
+
+ 委外订单号
+ {{ outsourcingInfo.outsourcingNo }}
+
+
+
+
+
+
+ 申请单号
+ {{ outsourcingInfo.requestNo }}
+
+
+ 标签张数
+
+ {{ outsourcingInfo.pickedLabels }}{{ outsourcingInfo.totalLabels }}
+
+
+
+ 物料总数
+
+ {{ outsourcingInfo.pickedQty }}{{ outsourcingInfo.totalQty }}
+
+
+
+
+
+
+
+ 发料信息确认
+
+
+ 物料清单
+
+
+
+
+
+
+
+
+ NO.
+ 标签条码
+ 物料编码
+ 单位
+ 标签数量
+
+
+
+
+ {{ labelList.length - index }}
+ {{ label.labelCode }}
+ {{ label.partNo }}
+ {{ label.unit || '个' }}
+ {{ label.quantity }}
+
+
+ 暂无扫描标签
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/modules/production-issue/production.vue b/src/views/modules/production-issue/production.vue
new file mode 100644
index 0000000..26fb3fc
--- /dev/null
+++ b/src/views/modules/production-issue/production.vue
@@ -0,0 +1,165 @@
+
+
-
-
-
-
-
-
-
- {{ orderInfo.orderNo }}
- {{ getStatusText(orderInfo.status) }}
-
-
-
-
- 发料清单
-
-
-
-
- {{ item.materialCode }} - {{ item.materialName }}
- 规格：{{ item.specification }}
-
- {{ item.locationCode }}
- 库存：{{ item.stock }}
-
-
- 需求：{{ item.requiredQuantity }} | 已发：{{ item.issuedQuantity }}
-
-
-
-
-
-
-
- 供应商确认
-
-
-
-
- 运输信息
-
-
-
-
-
-
- 确认发料
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/production-issue/productionIssuePda.vue b/src/views/modules/production-issue/productionIssuePda.vue
index 1c23fe1..1e81ede 100644
--- a/src/views/modules/production-issue/productionIssuePda.vue
+++ b/src/views/modules/production-issue/productionIssuePda.vue
@@ -146,84 +146,41 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
@@ -308,6 +276,7 @@ import {
printPalletLabel,
getPalletInfo,
scanMaterialLabel,
+ getIssureNotifyByNo,
} from '@/api/production/production-issue'
export default {
@@ -347,8 +316,12 @@ export default {
remark: '',
selectedMaterials: [],
},
- requestMaterials: [],
- selectedRequestMaterial: null,
+ requestList: [], // 申请发料单列表
+ selectedRequest: null, // 选中的申请发料单
+ requestPageNum: 1,
+ requestPageSize: 5,
+ requestHasMore: true,
+ requestLoading: false,
// 托盘拣选
palletForm: {
@@ -380,7 +353,7 @@ export default {
columnProp: 'partNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '材料单号',
+ columnLabel: '物料号',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -398,14 +371,14 @@ export default {
columnProp: 'desc',
headerAlign: 'center',
align: 'center',
- columnLabel: '材料描述',
+ columnLabel: '批号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100,
+ columnWidth: 50,
},
{
userId: this.$store.state.user.name,
@@ -423,7 +396,31 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100,
+ columnWidth: 60,
+ },
+ ],
+ materialListDialogVisible: false,
+ materialListData: [
+ {
+ partNo: 'MAT001',
+ partDesc: '材料描述1',
+ batchNo: 'BATCH001',
+ qty: 100,
+ location: 'A-01-01',
+ },
+ {
+ partNo: 'MAT002',
+ partDesc: '材料描述2',
+ batchNo: 'BATCH002',
+ qty: 50,
+ location: 'A-01-02',
+ },
+ {
+ partNo: 'MAT003',
+ partDesc: '材料描述3',
+ batchNo: 'BATCH003',
+ qty: 200,
+ location: 'B-02-01',
},
],
}
@@ -442,6 +439,10 @@ export default {
if (this.processFlag === 3) {
this.processFlag = 2
this.showScanLabel = false
+ // 重新查询申请单列表
+ this.requestPageNum = 1
+ this.requestHasMore = true
+ this.loadRequestMaterials(false)
} else if (this.processFlag === 2) {
this.processFlag = 1
this.selectedFunction = null
@@ -480,27 +481,19 @@ export default {
this.showScanLabel = true
this.processFlag = 3
},
- selectRequestMaterial(material) {
- if (material.remainQty <= 0) {
- this.showMessage('该物料已发料完成', 'warning')
- return
- }
- this.selectedRequestMaterial = material
- this.requestIssueForm.workOrderNo = material.workOrderNo
- this.scannedLabel = ''
- this.labelInfo = null
- this.issueQty = null
+ selectRequest(request) {
+ this.selectedRequest = request
this.scanLabelContext = {
type: 'request',
- notifyNo: this.requestIssueForm.notifyNo,
- partNo: material.partNo,
- material,
+ notifyNo: request.notifyNo,
+ workOrderNo: request.workOrderNo,
+ request,
}
this.scanLabelData = {
scannedLabel: '',
labelInfo: {
- partNo: this.partNo,
- batchNo: 'BATCH001',
+ notifyNo: request.notifyNo,
+ workOrderNo: request.workOrderNo,
availableQty: 100,
},
issueQty: null,
@@ -516,14 +509,17 @@ export default {
},
resetAll() {
this.workOrderMaterials = []
- this.requestMaterials = []
+ this.requestList = []
this.selectedMaterial = null
- this.selectedRequestMaterial = null
+ this.selectedRequest = null
this.currentPallet = {}
this.scannedLabel = ''
this.labelInfo = null
this.issueQty = null
this.message = ''
+ this.requestPageNum = 1
+ this.requestHasMore = true
+ this.requestList = []
},
// 直接发料相关方法
@@ -600,101 +596,75 @@ export default {
},
// 申请单发料相关方法
- async loadRequestMaterials() {
- /* if (!this.requestIssueForm.notifyNo) {
+ async loadRequestMaterials(isLoadMore) {
+ if (!this.requestIssueForm.notifyNo) {
this.showMessage('请输入申请单号', 'error')
return
}
-
- this.loading = true
- this.loadingText = '加载申请单物料...'
-
+ if (this.requestLoading) return
+ this.requestLoading = true
try {
- const response = await getRequestMaterials({
+ const response = await getIssureNotifyByNo({
site: this.requestIssueForm.site,
notifyNo: this.requestIssueForm.notifyNo,
+ pageNum: this.requestPageNum,
+ pageSize: this.requestPageSize,
})
-
if (response.data.code === 0) {
- this.requestMaterials = response.data.materials || []
- if (this.requestMaterials.length === 0) {
- this.showMessage('该申请单没有物料需求', 'warning')
+ const records = response.data.page.records || []
+ console.log(isLoadMore)
+ if (isLoadMore) {
+ this.requestList = this.requestList.concat(records)
+ } else {
+ this.requestList = []
+ this.requestList = records
+ }
+ this.requestHasMore = records.length === this.requestPageSize
+ if (!isLoadMore && this.requestList.length === 0) {
+ this.showMessage('该申请单没有发料需求', 'warning')
}
} else {
this.showMessage(response.data.msg, 'error')
}
} catch (error) {
- this.showMessage('加载申请单物料失败', 'error')
+ this.showMessage('加载申请发料单失败', 'error')
} finally {
- this.loading = false
- } */
-
- let materials = [
- {
- partNo: 'PART001',
- partDesc: '物料描述1',
- workOrderNo: 'WO001',
- requestQty: 100,
- issuedQty: 50,
- remainQty: 50,
- itemNo: 'ITEM001',
- },
- {
- partNo: 'PART002',
- partDesc: '物料描述2',
- workOrderNo: 'WO002',
- requestQty: 200,
- issuedQty: 100,
- remainQty: 100,
- itemNo: 'ITEM002',
- },
- ]
-
- //this.requestMaterials = materials
- this.$set(this, 'requestMaterials', materials)
- },
-
- async confirmRequestIssue() {
- if (!this.issueQty || this.issueQty <= 0) {
- this.showMessage('请输入有效的发料数量', 'error')
- return
+ this.requestLoading = false
}
-
- this.loading = true
- this.loadingText = '发料中，同步IFS...'
-
- try {
- const issueData = {
- ...this.requestIssueForm,
- selectedMaterials: [
- {
- ...this.selectedRequestMaterial,
- issueQty: this.issueQty,
- },
- ],
- scannedLabel: this.scannedLabel,
- }
-
- const response = await requestIssue(issueData)
-
- if (response.data.code === 0) {
- this.showMessage('发料成功，已同步到IFS', 'success')
- // 刷新物料列表
- await this.loadRequestMaterials()
- // 重置选择
- this.selectedRequestMaterial = null
- this.scannedLabel = ''
- this.labelInfo = null
- this.issueQty = null
- } else {
- this.showMessage(response.data.msg, 'error')
+ },
+ handleRequestListScroll(e) {
+ const el = e.target
+ if (el.scrollTop + el.clientHeight >= el.scrollHeight - 10) {
+ if (this.requestHasMore && !this.requestLoading) {
+ this.requestPageNum += 1
+ this.loadRequestMaterials(true)
}
- } catch (error) {
- this.showMessage('发料失败', 'error')
- } finally {
- this.loading = false
}
},
+ // 选择申请发料单
+ selectRequest(request) {
+ this.selectedRequest = request
+ this.scanLabelContext = {
+ type: 'request',
+ notifyNo: request.notifyNo,
+ workOrderNo: request.workOrderNo,
+ request,
+ }
+ this.scanLabelData = {
+ scannedLabel: '',
+ labelInfo: {
+ notifyNo: request.notifyNo,
+ workOrderNo: request.workOrderNo,
+ availableQty: 100,
+ },
+ issueQty: null,
+ remark: '',
+ message: '',
+ messageType: 'info',
+ }
+ this.showScanLabel = true
+ this.processFlag = 3
+ },
// 托盘拣选相关方法
async createPallet() {
@@ -849,11 +819,6 @@ export default {
},
async confirmScanLabelIssue() {
- if (!this.scanLabelData.issueQty || this.scanLabelData.issueQty <= 0) {
- this.scanLabelData.message = '请输入有效的发料数量'
- this.scanLabelData.messageType = 'error'
- return
- }
this.loading = true
this.scanLabelData.message = ''
try {
@@ -900,7 +865,7 @@ export default {
if (response.data.code === 0) {
this.scanLabelData.message = '发料成功'
this.scanLabelData.messageType = 'success'
- await this.loadRequestMaterials()
+ await this.loadRequestMaterials(false)
setTimeout(() => {
this.showScanLabel = false
this.processFlag = 2
@@ -923,25 +888,38 @@ export default {
let params = {
scanTableInput: this.scanTableInput,
}
- scanMaterialLabel(params).then(({data}) => {
- if (data.code === 0) {
- let material = {
- partNo: data.labelInfo.partNo ,
- desc: data.labelInfo.partDesc || '材料描述-' + this.scanTableInput,
- qty: 1, // 默认数量为1
+ scanMaterialLabel(params)
+ .then(({ data }) => {
+ if (data.code === 0) {
+ let material = {
+ partNo: data.labelInfo.partNo,
+ desc:
+ data.labelInfo.partDesc || '材料描述-' + this.scanTableInput,
+ qty: 1, // 默认数量为1
+ }
+ this.scanTableData.push(material)
+ this.scanTableInput = ''
+ } else {
+ this.$message.error(data.msg || '扫描失败')
+ return
}
- this.scanTableData.push(material)
- this.scanTableInput = ''
- } else {
- this.$message.error(data.msg || '扫描失败')
+ })
+ .catch((error) => {
+ this.$message.error('扫描异常: ' + error.message)
return
- }
- }).catch(error => {
- this.$message.error('扫描异常: ' + error.message)
- return
- })
-
-
+ })
+ },
+ showMaterialListDialog() {
+ this.materialListDialogVisible = true
+ },
+ selectMaterialFromList(material) {
+ this.scanTableInput = material.partNo
+ this.materialListDialogVisible = false
+ this.handleScanTableInput()
+ },
+ deleteScanTalbeData(row) {
+ this.scanTableData = this.scanTableData.filter(item => item.partNo !== row.partNo)
+ this.$message.success('删除成功')
},
},
}
@@ -1057,6 +1035,18 @@ export default {
font-size: 16px;
}
+/* 申请单号输入框绿色边框 */
+.request-issue .input-with-scan input {
+ border: 2px solid #17b3a3;
+ border-radius: 6px;
+}
+
+.request-issue .input-with-scan input:focus {
+ border-color: #13998c;
+ outline: none;
+ box-shadow: 0 0 0 2px rgba(23, 179, 163, 0.2);
+}
+
.scan-btn,
.confirm-btn,
.print-btn {
@@ -1332,4 +1322,41 @@ export default {
.confirm-btn {
width: 100%;
}
+
+/* 扫描标签页面固定底部按钮样式 */
+.scan-label-page {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ position: relative;
+}
+
+.scan-content {
+ flex: 1;
+ overflow-y: auto;
+ padding: 10px;
+ padding-bottom: 80px; /* 为底部按钮留出空间 */
+}
+
+.scan-bottom-actions {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background: #fff;
+ padding: 15px;
+ border-top: 1px solid #eee;
+ box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1);
+ z-index: 100;
+}
+.materials-section .material-list .material-item {
+ background: #fff;
+ border-radius: 8px;
+ box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.18);
+ padding: 18px 20px;
+ margin-bottom: 1px;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+}
diff --git a/src/views/modules/production-issue/productionPicking.vue b/src/views/modules/production-issue/productionPicking.vue
new file mode 100644
index 0000000..797b25c
--- /dev/null
+++ b/src/views/modules/production-issue/productionPicking.vue
@@ -0,0 +1,399 @@
+
+
-
+
+
+
+
- 物料编码:
- {{ labelInfo.partNo }}
-
-
- 批次号:
- {{ labelInfo.batchNo }}
-
-
- 可用数量:
- {{ labelInfo.availableQty }}
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
@@ -243,55 +200,66 @@
+
-
+
-
+
- 申请单: {{ request.notifyNo }}
+ {{ request.requestDesc }}
+ 工单: {{ request.workOrderNo }}
+
+ 申请数量: {{ request.requestQty }} |
+ 已发数量: {{ request.issuedQty }} |
+ 剩余数量: {{ request.remainQty }}
-
-
-
-
{{ material.partNo }}
- {{ material.partDesc }}
- 工单: {{ material.workOrderNo }}
-
- 申请: {{ material.requestQty }} |
- 已发: {{ material.issuedQty }} |
- 剩余: {{ material.remainQty }}
+
-
+ 待发料
+ 已完成
- 待发料
- 已完成
-
+ 加载中...
+ 没有更多了
+
+
-->
-
+
+
- 申请单号:{{ scanLabelData.labelInfo.notifyNo }}
+ 工单号:{{ scanLabelData.labelInfo.workOrderNo }}
+ 可用数量:{{ scanLabelData.labelInfo.availableQty }}
+
-
-
-
-
+ 物料编码:{{ scanLabelData.labelInfo.partNo }}
- 批次号:{{ scanLabelData.labelInfo.batchNo }}
- 可用数量:{{ scanLabelData.labelInfo.availableQty }}
-
-
-
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 删除
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row[item.columnProp] }}
- ![]()
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/production-issue/productionPickingDetail.vue b/src/views/modules/production-issue/productionPickingDetail.vue
new file mode 100644
index 0000000..f8a9346
--- /dev/null
+++ b/src/views/modules/production-issue/productionPickingDetail.vue
@@ -0,0 +1,984 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 出库单号
+ {{ item.notifyNo }}
+
+
+
+
+
+
+ 关联单号
+ {{ item.workOrderNo }}
+
+
+ 标签张数
+
+ {{ item.pickedLabels }}{{ item.totalLabels }}
+
+
+
+ 物料总数
+
+ {{ item.requestQty }}{{ item.remainQty }}
+
+
+
+
+
+
+ 暂无待领料出库单
+
+
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '移除' }}
+ {{ '添加' }}
+
+
+
+
+
+
+ 出库单号
+ {{ outboundInfo.outboundNo }}
+
+
+
+
+
+
+ 关联单号
+ {{ outboundInfo.relatedNo }}
+
+
+ 标签张数
+
+ {{ outboundInfo.pickedLabels }}{{ outboundInfo.totalLabels }}
+
+
+
+ 物料总数
+
+ {{ outboundInfo.pickedQty }}{{ outboundInfo.totalQty }}
+
+
+
+
+
+
+
+ 出库信息确认
+
+
+ 物料清单
+
+
+
+
+
+
+
+
+ NO.
+ 标签条码
+ 物料编码
+ 单位
+ 标签数量
+
+
+
+
+ {{ labelList.length - index }}
+ {{ label.labelCode }}
+ {{ label.partNo }}
+ {{ label.unit || '个' }}
+ {{ label.quantity }}
+
+
+ 暂无扫描标签
+
+
+
+
+
+
+
+
+