yuyubo/MeiSaiSiXieTongApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

323232

Browse Source
This commit is contained in:
余宇波 2025-05-13 13:51:53 +08:00
parent 16fc0304f3
commit 29c83dd9da
11 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs
View File

@ -31,10 +31,15 @@ namespace MyCode.Project.Domain.Dtos.Request.Act
public string VersionName { get; set; }
/// <summary>
/// 版本号
/// 珠海版本号
/// </summary>
public int Version { get; set; }
/// <summary>
/// 泰国版本号
/// </summary>
public int TaiGuoVersion { get; set; }
/// <summary>
/// 备注
/// </summary>
@ -62,10 +67,15 @@ namespace MyCode.Project.Domain.Dtos.Request.Act
public string VersionName { get; set; }
/// <summary>
/// 版本号
/// 珠海版本号版本号
/// </summary>
public int Version { get; set; }
/// <summary>
/// 泰国版本号
/// </summary>
public int TaiGuoVersion { get; set; }
}
}

5
MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs
View File

@ -66,6 +66,11 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
/// </summary>
public string FPH { get; set; }
/// <summary>
/// 发票日期
/// </summary>
public string F_URXD_Date { get; set; }
}

6
MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
View File

@ -27,6 +27,12 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
/// </summary>
public string F_VHUB_Text { get; set; }
/// <summary>
/// 发票日期
/// </summary>
public string F_URXD_Date { get; set; }
/// <summary>
/// 明细内容
/// </summary>

6
MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
View File

@ -147,6 +147,12 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
/// </summary>
public string F_VHUB_Text { get; set; }
/// <summary>
/// Desc:发票日期
/// </summary>
public string F_URXD_Date { get; set; }
/// <summary>
/// 明细的打印条码内容,前端取它生成二维码
/// </summary>

7
MyCode.Project.Domain/Model/InvoiceOrder.cs
View File

@ -127,5 +127,12 @@ namespace MyCode.Project.Domain.Model
/// </summary>
public string FPurchaseOrgName {get;set;}
/// <summary>
/// Desc:发票日期
/// Default:
/// Nullable:True
/// </summary>
public string F_URXD_Date {get;set;}
}
}

2
MyCode.Project.Domain/Model/TiaoMa.cs
View File

@ -80,7 +80,7 @@ namespace MyCode.Project.Domain.Model
public Guid? PurchaseOrderItemId {get;set;}
/// <summary>
/// Desc:采购明细单主键ID
/// Desc:发货明细单主键ID
/// Default:
/// Nullable:True
/// </summary>

2
MyCode.Project.GenerateCode/App.config
View File

@ -11,7 +11,7 @@
<connectionStrings>
<!--测试主库的链接地址-->
<add name="MasterConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=bfy" providerName="System.Data.SqlClient" />
<add name="MasterConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=xietong; User ID=meisaisi;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>

2
MyCode.Project.Repositories/InvoiceOrderRepository.cs
View File

@ -58,7 +58,7 @@ namespace MyCode.Project.Repositories
,[CreateTime]
,[Editor]
,[EditTime],FPurchaseOrgId,FPurchaseOrgName
,F_VHUB_Text
,F_VHUB_Text ,F_URXD_Date
,(SELECT qty FROM PurchaseOrderItem cc WITH(NOLOCK) WHERE cc.id=b.[PurchaseOrderItemId] ) PurchaseQty
, (b.[FBillNo] ) AS PurchaseOrderFBillNo
, isnull((select FReceiveQty from PurchaseOrderItem bb with(nolock) where bb.id=b.[PurchaseOrderItemId] ),0) as SendedQty

2
MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
View File

@ -304,6 +304,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.FBillNo = order.FBillNo;
tiaoMa.SupplierId = order.SupplierId;
tiaoMa.SupplierName = order.SupplierName;
tiaoMa.InvoceOrderItemId = orderItem.Id;
addList.Add(tiaoMa);
}
if (yu > 0)
@ -319,6 +320,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.FBillNo = order.FBillNo;
tiaoMa.SupplierId = order.SupplierId;
tiaoMa.SupplierName = order.SupplierName;
tiaoMa.InvoceOrderItemId = orderItem.Id;
addList.Add(tiaoMa);
}
if (addList.Count > 0)

2
MyCode.Project.Services/Implementation/PurchaseOrder/GlobalSwitchService.cs
View File

@ -56,6 +56,7 @@ namespace MyCode.Project.Services.Implementation
{
result.IfCheckVersion = temp.IfCheckVersion;
result.Version = temp.Version;
result.TaiGuoVersion = temp.TaiGuoVersion;
result.VersionName = temp.VersionName;
}
}
@ -86,6 +87,7 @@ namespace MyCode.Project.Services.Implementation
value.IfCheckVersion = act.IfCheckVersion;
value.Version = act.Version;
value.VersionName = act.VersionName;
value.TaiGuoVersion = act.TaiGuoVersion;
config.Value = value.ToJson();
config.Note = act.Note;
config.EditTime = DateTime.Now;

2
MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
View File

@ -334,6 +334,7 @@ namespace MyCode.Project.Services.Implementation
NewInvoiceOrder.Sheet = DateTime.Now.ToString("yyMMddhhmmssfff");
NewInvoiceOrder.PurchaseOrderId = 0;
NewInvoiceOrder.F_VHUB_Text = act.F_VHUB_Text;
NewInvoiceOrder.F_URXD_Date = act.F_URXD_Date;
NewInvoiceOrder.FPurchaseOrgId = orderHeadList.FirstOrDefault().FPurchaseOrgId;
NewInvoiceOrder.FPurchaseOrgName = orderHeadList.FirstOrDefault().FPurchaseOrgName;
List<InvoiceOrderItem> invoiceOrderItems = new List<InvoiceOrderItem>();
@ -402,6 +403,7 @@ namespace MyCode.Project.Services.Implementation
tempUpdate.FSupplierLot = temp.FSupplierLot;
billPush.CustomParams.ScanEntry.Add(tempUpdate);
billPush.CustomParams.FPH= act.F_VHUB_Text;
billPush.CustomParams.F_URXD_Date = act.F_URXD_Date;
t.FReceiveQty = t.FReceiveQty.SafeValue() + temp.Qty;
t.FRemainReceiveQty = t.FRemainReceiveQty.SafeValue() - temp.Qty;