完善出库操作页面,适配成品出库接口
This commit is contained in:
1 parent
d8febf4f05
commit
80d1b201b0
9 files changed
+2582
-11
No files matched your search
@@ -10,6 +10,24 @@
|
||||
line-height: 1.3;
|
||||
white-space: nowrap;
|
||||
word-break: keep-all;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
/* 普通入库字段较少:固定表格布局、完整换行,避免横向拖动。 */
|
||||
#receiptin .receipt-wrap-table .arco-table-td .arco-table-cell,
|
||||
#receiptin .receipt-wrap-table .arco-table-td .arco-table-cell-wrap-value {
|
||||
white-space: normal;
|
||||
word-break: normal;
|
||||
overflow-wrap: anywhere;
|
||||
overflow: visible;
|
||||
text-overflow: clip;
|
||||
}
|
||||
|
||||
#receiptin .receipt-wrap-table .arco-table-th .arco-table-cell,
|
||||
#receiptin .receipt-wrap-table .arco-table-th .arco-table-cell-wrap-value,
|
||||
#receiptin .receipt-wrap-table .arco-table-td:last-child .arco-table-cell {
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
<div id="receiptin">
|
||||
@@ -96,7 +114,9 @@
|
||||
当前托盘来自ERP发货任务。请逐条填写实际出库数量(可以为0),确认后系统一次完成库存扣减、释放分配并回传ERP。
|
||||
</a-alert>
|
||||
|
||||
<a-table class="shipment-compact-table" size="small" :scroll="{ x: 1600 }"
|
||||
<a-table class="shipment-compact-table" :class="{ 'receipt-wrap-table': !isShipment }"
|
||||
size="small" table-layout-fixed
|
||||
:scroll="isShipment ? { x: 1580 } : undefined"
|
||||
:data="bindList" :columns="displayColumns" :pagination="false"
|
||||
:row-key="record => isShipment ? record.TaskDetailId : record.Id">
|
||||
<template #operations="{ record }">
|
||||
@@ -191,38 +211,42 @@
|
||||
{
|
||||
title: 'Id',
|
||||
dataIndex: 'Id',
|
||||
width: 80
|
||||
width: 65
|
||||
},
|
||||
{
|
||||
title: '容器编码',
|
||||
dataIndex: 'ContainerCode',
|
||||
width: 100
|
||||
width: 105
|
||||
},
|
||||
{
|
||||
title: '物料编码',
|
||||
dataIndex: 'MaterialCode',
|
||||
width: 120,
|
||||
width: 105,
|
||||
},
|
||||
{
|
||||
title: '图号',
|
||||
dataIndex: 'MaterialName',
|
||||
width: 120,
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '物料型号',
|
||||
dataIndex: 'MaterialSpec',
|
||||
width: 120,
|
||||
},
|
||||
{
|
||||
title: '部件名称',
|
||||
dataIndex: 'Batch',
|
||||
width: 110,
|
||||
},
|
||||
{
|
||||
title: '客户订单',
|
||||
dataIndex: 'SourceCode',
|
||||
width: 120,
|
||||
},
|
||||
{
|
||||
title: '公司',
|
||||
dataIndex: 'CompanyCode',
|
||||
width: 120,
|
||||
},
|
||||
{
|
||||
title: 'ERP发货单',
|
||||
@@ -251,7 +275,8 @@
|
||||
{
|
||||
title: '当前库存',
|
||||
dataIndex: 'Qty',
|
||||
slotName: 'Qty'
|
||||
slotName: 'Qty',
|
||||
width: 90
|
||||
},
|
||||
{
|
||||
title: '实际出库',
|
||||
@@ -263,7 +288,7 @@
|
||||
{
|
||||
title: '操作',
|
||||
slotName: 'operations',
|
||||
width: 120
|
||||
width: 105
|
||||
}
|
||||
],
|
||||
formData: {
|
||||
|
||||
@@ -672,6 +672,7 @@ namespace HHWMS.Web.Controllers
|
||||
const int pageSize = 100;
|
||||
var page = 1;
|
||||
var total = 0;
|
||||
var fetchedCount = 0;
|
||||
do
|
||||
{
|
||||
var request = new LoadDispatchRequest
|
||||
@@ -696,10 +697,11 @@ namespace HHWMS.Web.Controllers
|
||||
total = apiResult.Data.Count;
|
||||
if (apiResult.Data.Data != null)
|
||||
{
|
||||
items.AddRange(apiResult.Data.Data.Where(x => x.BReturnFlag == 0));
|
||||
fetchedCount += apiResult.Data.Data.Count;
|
||||
items.AddRange(apiResult.Data.Data.Where(x => !x.BReturnFlag));
|
||||
}
|
||||
page++;
|
||||
} while (items.Count < total && page <= 100);
|
||||
} while (fetchedCount < total && page <= 100);
|
||||
|
||||
if (!items.Any())
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace HHWMS.Web.Models
|
||||
{
|
||||
public string DLCode { get; set; }
|
||||
|
||||
public int BReturnFlag { get; set; }
|
||||
public bool BReturnFlag { get; set; }
|
||||
|
||||
public DateTime? CreateDate { get; set; }
|
||||
|
||||
|
||||
Reference in new issue
Block a user