wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
周科达
2024-07-22 17:04:38 +08:00
parent 46ef173bb5
commit ad604ac5ab
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2150,14 +2150,14 @@ namespace Tnb.ProductionMgr
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
erpRequestDataDetails.Add(new Dictionary<string, object>() erpRequestDataDetails.Add(new Dictionary<string, object>()
{ {
["bbchkflag"] = "N", ["bbchkflag"] = false,
["bbhasbckfled"] = "N", ["bbhasbckfled"] = false,
["bbhaspicked"] = "N", ["bbhaspicked"] = false,
["bbinstock"] = "N", ["bbinstock"] = false,
["bbisempass"] = "N", ["bbisempass"] = false,
["bbotherreject"] = "N", ["bbotherreject"] = false,
["bbsetmark"] = "N", ["bbsetmark"] = false,
["bbstockbycheck"] = "N", ["bbstockbycheck"] = false,
["cbastunitid"] = "", ["cbastunitid"] = "",
["cbbomversionid"] = "", ["cbbomversionid"] = "",
["cbdeptid"] = "", ["cbdeptid"] = "",

7
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -773,8 +773,10 @@ namespace Tnb.ProductionMgr
[AllowAnonymous] [AllowAnonymous]
public async Task<String> SyncBaseData() public async Task<String> SyncBaseData()
{ {
string msg = "";
try try
{ {
int editCount = 0;
string[] tables = new[] { "base_dictionarydata", "bas_material" }; string[] tables = new[] { "base_dictionarydata", "bas_material" };
var erpdb = _db.AsTenant().GetConnection("erpdb"); var erpdb = _db.AsTenant().GetConnection("erpdb");
List<ErpBdMaterial> list = await erpdb.Queryable<ErpBdMaterial>().ToListAsync(); List<ErpBdMaterial> list = await erpdb.Queryable<ErpBdMaterial>().ToListAsync();
@@ -869,6 +871,7 @@ namespace Tnb.ProductionMgr
.SetColumns(x => x.erp_modify_time == erpBdMaterial.MODIFIEDTIME) .SetColumns(x => x.erp_modify_time == erpBdMaterial.MODIFIEDTIME)
.Where(x => x.id == materialId) .Where(x => x.id == materialId)
.ExecuteCommandAsync(); .ExecuteCommandAsync();
editCount += updateRow;
if (updateRow <= 0) if (updateRow <= 0)
{ {
Log.Error($"未找到物料{erpBdMaterial.ID},跳过此条数据"); Log.Error($"未找到物料{erpBdMaterial.ID},跳过此条数据");
@@ -1019,6 +1022,8 @@ namespace Tnb.ProductionMgr
await _db.Insertable(insertBasEbomDs).ExecuteCommandAsync(); await _db.Insertable(insertBasEbomDs).ExecuteCommandAsync();
await _db.Ado.CommitTranAsync(); await _db.Ado.CommitTranAsync();
msg = $"新增物料${insertMaterial.Count}条,修改物料{editCount}条";
Log.Information(msg);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -1027,7 +1032,7 @@ namespace Tnb.ProductionMgr
throw Oops.Bah(e.Message); throw Oops.Bah(e.Message);
} }
return "成功"; return msg;
} }
/// <summary> /// <summary>