From 6912d8235648a51e2e7b7e93d0f5b5e868511462 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 06 八月 2024 12:45:59 +0800
Subject: [PATCH] 添加读取配置的类。将数据库连接，接口地址写入到配置文件中，获取时通过配置文件获取
---
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
index c27ff9a..d2b4515 100644
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -1,7 +1,10 @@
锘縰sing System.Data;
using MES.Service.DB;
+using MES.Service.Dto.@base;
using MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.util;
+using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using SqlSugar;
using DbType = System.Data.DbType;
@@ -11,8 +14,6 @@
public class MesInvItemInCDetailsManager : Repository<MesInvItemInCDetails>
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- private readonly MessageCenterManager _messageCenterManager = new();
public PurchaseInventory SaveBarCodes(WarehouseQuery entity)
{
@@ -27,7 +28,7 @@
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
Db.Ado.ExecuteCommand(
- "BEGIN prc_rf_pda_scan_in_barcode(:c_in_str, :c_result); END;",
+ "BEGIN prc_rf_pda_scan_in_barcode_N(:c_in_str, :c_result); END;",
new SugarParameter("c_in_str", inputParam,
DbType.String), outputParam);
@@ -108,36 +109,10 @@
}).ToPageList(query.PageIndex, query.Limit);
}
- public List<MesInvItemInCDetails> GetItemInDetails(decimal? pid)
+ public List<MesInvItemInCItems> GetItemInDetails(decimal? pid)
{
- var result = Db.Queryable<MesInvItemInCDetails, MesItems>(
- (g, c) => new JoinQueryInfos(
- JoinType.Left,
- g.ItemNo == c.ItemNo && g.Company == c.Company &&
- g.Factory == c.Factory
- )
- )
- .WhereIF(pid > 0, (g, c) => g.ItemInId == pid)
- .GroupBy((g, c) => new
- {
- g.Company, g.Factory, g.ItemInId, g.WorkNo, g.ItemNo,
- g.BoardStyle, g.WorkLine, c.ItemName, c.ItemModel, c.ItemUnit
- })
- .Select((g, c) => new MesInvItemInCDetails
- {
- Company = g.Company,
- Factory = g.Factory,
- ItemInId = g.ItemInId,
- WorkNo = g.WorkNo,
- ItemNo = g.ItemNo,
- ItemName = c.ItemName,
- ItemModel = c.ItemModel,
- ItemUnit = c.ItemUnit,
- BoardStyle = g.BoardStyle,
- WorkLine = g.WorkLine,
- SumQuantity = SqlFunc.AggregateSum(g.Quantity) // 鑱氬悎璁＄畻
- })
- .ToList();
+ var result = Db.Queryable<MesInvItemInCItems>()
+ .WhereIF(pid > 0, g => g.ItemInId == pid).ToList();
return result;
}
@@ -170,7 +145,7 @@
return result;
}
-
+
public MessageCenter MesToErpParam(WarehouseQuery query)
{
var erpParameters = "";
@@ -187,10 +162,11 @@
title = "閲囪喘鍏ュ簱鍗�" + query.billNo + "鍙嶅鏍�";
}
+ string ErpUrl = AppsettingsUtility.Settings.TestErpUrl;
var message = new MessageCenter
{
TableName = tableName,
- Url = "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
+ Url = ErpUrl,
Status = 1,
CreateBy = query.userName,
Route = query.billNo,
@@ -255,7 +231,7 @@
if (invItemIns.Status == 1) throw new Exception("鍏ュ簱鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�");
- var materials = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit,
+ var materials = Db.Queryable<MesInvItemInCItems, MesItems, MesUnit,
MesInvItemArnDetail>(
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
--
Gitblit v1.9.3