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

2321

Browse Source
This commit is contained in:
余宇波 2025-05-15 23:43:24 +08:00
parent c9c27ac3dc
commit 0ecbc73c0b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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=meisaisi;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<add name="MasterConn" connectionString="Data Source=8.148.230.89,30003; Initial Catalog=xietong; User ID=meisaisi2;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>

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

@ -17,7 +17,7 @@
<!--新测试环境数据库 -->
<!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=AIS20250304232155; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=bfy" providerName="System.Data.SqlClient" />-->
<add name="MasterConn" connectionString="Data Source=8.134.66.212,30003; Initial Catalog=xietong; User ID=meisaisi;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<add name="MasterConn" connectionString="Data Source=8.134.66.212,30003; Initial Catalog=xietong; User ID=meisaisi2;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<!--正式主库的链接地址-->

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

@ -345,7 +345,7 @@ namespace MyCode.Project.Services.Implementation
_workProcessService.Add<IKingDeeService>(this.MerchantId, "AddTiaoMa", "生成条码档案", JsonHelper.ToJson(addTiaoMas), 5);
}
addList = addList.OrderBy(t => t.SortNum).ToList();
TiaoMaResp result = new TiaoMaResp();
result.Id = orderItem.Id;
result.BarCodeList = addList;

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

@ -362,14 +362,14 @@ namespace MyCode.Project.Services.Implementation
list.ForEach(t =>
{
var allqty = allInvoiceOrderItem.Where(h => h.PurchaseOrderItemId == t.Id ).Sum(h => h.Qty).SafeValue();
//var allqty = allInvoiceOrderItem.Where(h => h.PurchaseOrderItemId == t.Id ).Sum(h => h.Qty).SafeValue();
var temp = updateList.Where(h => h.Id == t.Id).FirstOrDefault();
if (temp != null)
{
var purchaseOrder = orderHeadList.FirstOrDefault(h=>h.FiD==t.Fid);
if (purchaseOrder == null)
throw new BaseException("找不到对应的采购订单主表信息");
if ((temp.Qty ) > (t.Qty - t.FReceiveQty))
if ((temp.Qty ) > (t.Qty - t.MSSReceiveQty))
{
string error = $@"{t.MaterialName}";
errorList.Add(error);

2
MyCode.Project.WebApi/Web.config
View File

@ -24,7 +24,7 @@
</httpProtocol>
</system.webServer>
<connectionStrings>
<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" />
<add name="MasterConn" connectionString="Data Source=8.148.230.89,30003; Initial Catalog=xietong; User ID=meisaisi2;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=tempdata; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />-->
</connectionStrings>
<appSettings>