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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-07-16 12:45:43 +08:00
parent bfc22c7326 97045e3bbe
commit bf39c08837
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,6 +280,9 @@ namespace Tnb.ProductionMgr
.Where((x, y) => x.code == "ZSJ") .Where((x, y) => x.code == "ZSJ")
.Select((x, y) => y).ToListAsync(); .Select((x, y) => y).ToListAsync();
int? cs01Count = await _redisData.TryGetValueByKeyField<int?>("YTCS", "EmptyNo_CS01");
int? cs03Count = await _redisData.TryGetValueByKeyField<int?>("YTCS", "EmptyNo_CS03");
List<String> eqpIds = equipments.Select(x => x.id).ToList(); List<String> eqpIds = equipments.Select(x => x.id).ToList();
List<EqpDaq> eqpDaqs = await _db.Queryable<EqpDaq>().Where(x => eqpIds.Contains(x.equip_id) && x.label_name.Contains("允许入空箱")).ToListAsync(); List<EqpDaq> eqpDaqs = await _db.Queryable<EqpDaq>().Where(x => eqpIds.Contains(x.equip_id) && x.label_name.Contains("允许入空箱")).ToListAsync();
//BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN); //BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN);
@@ -475,7 +478,16 @@ namespace Tnb.ProductionMgr
stopwatch.Stop(); stopwatch.Stop();
elapsedMilliseconds = stopwatch.ElapsedMilliseconds; elapsedMilliseconds = stopwatch.ElapsedMilliseconds;
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response); try
{
thirdResult = JsonConvert.DeserializeObject<ThirdResult>(response);
}
catch (Exception e)
{
thirdResult.Code = 500;
thirdResult.msgResult = response;
}
if (thirdResult.Code == 200) if (thirdResult.Code == 200)
{ {
await _db.Updateable<ThirdWebapiRecord>() await _db.Updateable<ThirdWebapiRecord>()

9
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -2368,6 +2368,7 @@ namespace Tnb.WarehouseMgr
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync(); List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? ""; string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? "";
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
@@ -2375,13 +2376,13 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("billmaker",erpCreateId); erpRequestData.Add("billmaker",erpCreateId);
erpRequestData.Add("corpoid",erpOrg.corpoid); erpRequestData.Add("corpoid",erpOrg.corpoid);
erpRequestData.Add("corpvid",erpOrg.corpvid); erpRequestData.Add("corpvid",erpOrg.corpvid);
erpRequestData.Add("creationtime",DateTime.Now); erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("ctrantypeid","0001H11000000000D30Z"); erpRequestData.Add("ctrantypeid","0001H11000000000D30Z");
erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
erpRequestData.Add("cwhsmanagerid",""); erpRequestData.Add("cwhsmanagerid","");
erpRequestData.Add("dbilldate",DateTime.Now); erpRequestData.Add("dbilldate",nowStr);
erpRequestData.Add("dmakedate",DateTime.Now); erpRequestData.Add("dmakedate",nowStr);
erpRequestData.Add("ntotalnum",wmsMaterialTransferDs.Sum(x=>x.qty)); erpRequestData.Add("ntotalnum",wmsMaterialTransferDs.Sum(x=>x.qty));
erpRequestData.Add("pk_group",erpOrg.pk_group); erpRequestData.Add("pk_group",erpOrg.pk_group);
erpRequestData.Add("pk_org",erpOrg.pk_org); erpRequestData.Add("pk_org",erpOrg.pk_org);
@@ -2406,7 +2407,7 @@ namespace Tnb.WarehouseMgr
["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cvendorid"] = "", ["cvendorid"] = "",
["cvendorvid"] = "", ["cvendorvid"] = "",
["dbizdate"] = DateTime.Now, ["dbizdate"] = nowStr,
["nnum"] = item.qty, ["nnum"] = item.qty,
["pk_group"] = erpOrg.pk_group, ["pk_group"] = erpOrg.pk_group,
["pk_org"] = erpOrg.pk_org, ["pk_org"] = erpOrg.pk_org,

9
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -649,6 +649,7 @@ namespace Tnb.WarehouseMgr
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
erpRequestData.Add("billmaker",erpCreateId); erpRequestData.Add("billmaker",erpCreateId);
erpRequestData.Add("cdptid","1001A1100000000JRLI1A100");// 先写死 erpRequestData.Add("cdptid","1001A1100000000JRLI1A100");// 先写死
erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死 erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死
@@ -656,12 +657,12 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("corpvid",erpOrg.corpoid); erpRequestData.Add("corpvid",erpOrg.corpoid);
erpRequestData.Add("cothercalbodyoid",erpOrg.cdptid); erpRequestData.Add("cothercalbodyoid",erpOrg.cdptid);
erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
erpRequestData.Add("creationtime",DateTime.Now); erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("ctrantypeid","0001H11000000000D31W"); erpRequestData.Add("ctrantypeid","0001H11000000000D31W");
erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? ""); erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "");
erpRequestData.Add("dbilldate",DateTime.Now); erpRequestData.Add("dbilldate",nowStr);
erpRequestData.Add("dmakedate",DateTime.Now); erpRequestData.Add("dmakedate",nowStr);
erpRequestData.Add("ntotalnum",wmsCarryCodes.Sum(r => r.codeqty)); erpRequestData.Add("ntotalnum",wmsCarryCodes.Sum(r => r.codeqty));
erpRequestData.Add("pk_group",erpOrg.pk_group); erpRequestData.Add("pk_group",erpOrg.pk_group);
erpRequestData.Add("pk_org",erpOrg.pk_org); erpRequestData.Add("pk_org",erpOrg.pk_org);
@@ -683,7 +684,7 @@ namespace Tnb.WarehouseMgr
["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "",
["cvendorid"] = "", ["cvendorid"] = "",
["cvendorvid"] = "", ["cvendorvid"] = "",
["dbizdate"] = DateTime.Now, ["dbizdate"] = nowStr,
["nnum"] = wmsCarryCodes.Sum(r => r.codeqty), ["nnum"] = wmsCarryCodes.Sum(r => r.codeqty),
["nshouldnum"] = wmsMaterialTransferd.qty, ["nshouldnum"] = wmsMaterialTransferd.qty,
["pk_group"] = erpOrg.pk_group, ["pk_group"] = erpOrg.pk_group,