feat: 接入ERP成品发货出库流程
This commit is contained in:
1 parent
66a1f60428
commit
7c2722c88d
25 files changed
+2547
-22
No files matched your search
+18
-4
@@ -40,6 +40,9 @@ namespace HHWMS.Web
|
||||
this.MakeAction("InventoryTransaction", "RetryAddOtherOut", "补传ERP领料出库", "", GridActionParameterTypesEnum.SingleId, "inventory")
|
||||
.SetShowDialog(false).SetShowInRow(true).SetHideOnToolBar()
|
||||
.SetBindVisiableColName(nameof(InventoryTransaction_View.CanRetryOtherOut)),
|
||||
this.MakeAction("InventoryTransaction", "RetryAddSaleOut", "补传ERP成品出库", "", GridActionParameterTypesEnum.SingleId, "inventory")
|
||||
.SetShowDialog(false).SetShowInRow(true).SetHideOnToolBar()
|
||||
.SetBindVisiableColName(nameof(InventoryTransaction_View.CanRetrySaleOut)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -75,17 +78,24 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode),
|
||||
this.MakeGridHeader(x => x.BillType).SetHide(),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.BillCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.BillType)
|
||||
.SetFormat((a, b) => a.BillType == InventoryTransaction.ErpOtherOutBillType
|
||||
? "ERP领料出库"
|
||||
: a.BillType == InventoryTransaction.ErpSaleOutBillType
|
||||
? "ERP成品出库"
|
||||
: a.BillType),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.BillCode),
|
||||
this.MakeGridHeader(x => x.BillDetailId).SetHide(),
|
||||
this.MakeGridHeader(x => x.Status).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadErpFlag)
|
||||
.SetFormat((a, b) => a.BillType != InventoryTransaction.ErpOtherOutBillType
|
||||
&& a.BillType != InventoryTransaction.ErpSaleOutBillType
|
||||
? "无需回传"
|
||||
: a.UploadErpFlag == 1 ? "成功" : "失败"),
|
||||
this.MakeGridHeader(x => x.CanRetryOtherOut).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
this.MakeGridHeader(x => x.CanRetrySaleOut).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 260)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -136,6 +146,9 @@ namespace HHWMS.Web
|
||||
CanRetryOtherOut = x.Type == InventoryTranType.出库
|
||||
&& x.BillType == InventoryTransaction.ErpOtherOutBillType
|
||||
&& x.UploadErpFlag != 1 ? "true" : "false",
|
||||
CanRetrySaleOut = x.Type == InventoryTranType.出库
|
||||
&& x.BillType == InventoryTransaction.ErpSaleOutBillType
|
||||
&& x.UploadErpFlag != 1 ? "true" : "false",
|
||||
CreateTime = x.CreateTime,
|
||||
})
|
||||
.OrderBy(x => x.ID);
|
||||
@@ -146,5 +159,6 @@ namespace HHWMS.Web
|
||||
public class InventoryTransaction_View : InventoryTransaction
|
||||
{
|
||||
public string CanRetryOtherOut { get; set; }
|
||||
public string CanRetrySaleOut { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user