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-09-05 17:29:02 +08:00
parent 8d3b1ec753 d085ed872d
commit 27536bfd7c
7 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr/MesForErpService.cs
View File

@@ -144,7 +144,7 @@ namespace Tnb.ProductionMgr
item.erp_mo_pk = item.erp_mo_pk; item.erp_mo_pk = item.erp_mo_pk;
item.erp_line_pk = item.erp_line_pk; item.erp_line_pk = item.erp_line_pk;
item.erp_lineno = item.erp_lineno; item.erp_lineno = item.erp_lineno;
item.unit_id = unitDic?.Id ?? item.unit_id; item.unit_id = unitDic?.EnCode ?? item.unit_id;
moList.Add(item); moList.Add(item);
} }

2
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -138,7 +138,7 @@ namespace Tnb.ProductionMgr
SqlSugarPagedList<PrdMoListOuput> result = await db.Queryable<PrdMo>() SqlSugarPagedList<PrdMoListOuput> result = await db.Queryable<PrdMo>()
.LeftJoin<BasMaterial>((a, b) => a.material_id == b.id) .LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
.LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == DictConst.MeasurementUnit) .LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == DictConst.MeasurementUnit)
.LeftJoin<DictionaryDataEntity>((a, b, c, d) => c.Id == d.DictionaryTypeId && a.unit_id == d.Id) .LeftJoin<DictionaryDataEntity>((a, b, c, d) => c.Id == d.DictionaryTypeId && a.unit_id == d.EnCode)
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => a.mo_status == e.Id) .LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => a.mo_status == e.Id)
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e, f) => a.mo_type == f.Id) .LeftJoin<DictionaryDataEntity>((a, b, c, d, e, f) => a.mo_type == f.Id)
.WhereIF(!string.IsNullOrEmpty(moCode), (a, b, c, d, e) => a.mo_code.Contains(moCode)) .WhereIF(!string.IsNullOrEmpty(moCode), (a, b, c, d, e) => a.mo_code.Contains(moCode))

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

@@ -2482,18 +2482,18 @@ namespace Tnb.ProductionMgr
//来源erp需要调接口 //来源erp需要调接口
if (prdMo.mo_source == "1") if (prdMo.mo_source == "1")
{ {
// List<DictionaryDataEntity> unitDatas = await db.Queryable<DictionaryTypeEntity>() List<DictionaryDataEntity> unitDatas = await db.Queryable<DictionaryTypeEntity>()
// .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId) .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
// .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id) .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id)
// .Select((x, y) => y) .Select((x, y) => y)
// .ToListAsync(); .ToListAsync();
List<string> erpExtendIds = new List<string>(); List<string> erpExtendIds = new List<string>();
erpExtendIds.Add(_userManager.UserId); erpExtendIds.Add(_userManager.UserId);
erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId);
erpExtendIds.Add(report.material_id); erpExtendIds.Add(report.material_id);
erpExtendIds.Add(report.unit_id); // erpExtendIds.Add(report.unit_id);
// erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList());
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync(); List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? ""; string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? "";
@@ -2534,8 +2534,8 @@ namespace Tnb.ProductionMgr
["cbmoid"] = prdMo.erp_mo_pk, ["cbmoid"] = prdMo.erp_mo_pk,
// ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", // ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
// ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
["cbunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "", ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cbastunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "", ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "",
["nbplanwrnum"] = report.reported_qty, ["nbplanwrnum"] = report.reported_qty,
["nbwrnum"] = report.reported_qty, ["nbwrnum"] = report.reported_qty,
["tbendtime"] = nowStr, ["tbendtime"] = nowStr,
@@ -2632,8 +2632,8 @@ namespace Tnb.ProductionMgr
} }
catch (Exception e) catch (Exception e)
{ {
Log.Error("提报入库任务下发失败", e); Log.Error("提报入库任务下发失败:"+e.Message, e);
throw new Exception("提报入库任务下发失败"); throw new Exception("提报入库任务下发失败:"+e.Message);
} }
return "入库任务下发成功"; return "入库任务下发成功";

9
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -8,6 +8,7 @@ using JNPF.DynamicApiController;
using JNPF.FriendlyException; using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission; using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System; using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.Permission;
using JNPF.Systems.Interfaces.System; using JNPF.Systems.Interfaces.System;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@@ -38,13 +39,16 @@ namespace Tnb.ProductionMgr
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService; private readonly IDictionaryDataService _dictionaryDataService;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IOrganizeService _organizeService;
private static Dictionary<string, Tuple<string, string>> _dicWorkLine = new(); private static Dictionary<string, Tuple<string, string>> _dicWorkLine = new();
public PrdPackReportService(ISqlSugarRepository<PrdMoTask> repository, public PrdPackReportService(ISqlSugarRepository<PrdMoTask> repository,
IUserManager userManager, IUserManager userManager,
IOrganizeService organizeService,
IDictionaryDataService dictionaryDataService) IDictionaryDataService dictionaryDataService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
_organizeService = organizeService;
_dictionaryDataService = dictionaryDataService; _dictionaryDataService = dictionaryDataService;
} }
/// <summary> /// <summary>
@@ -417,6 +421,8 @@ namespace Tnb.ProductionMgr
} }
string userId = _userManager.UserId; string userId = _userManager.UserId;
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(_userManager.User.OrganizeId,DictConst.RegionCategoryWorklineCode);
string userWorklineId = workline?.Id ?? "";
string nowTime = DateTime.Now.ToString("HH:mm"); string nowTime = DateTime.Now.ToString("HH:mm");
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME); BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME);
Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value); Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value);
@@ -464,7 +470,8 @@ namespace Tnb.ProductionMgr
.WhereIF(statusList.Count > 0, a => statusList.Contains(a.mo_task_status)) .WhereIF(statusList.Count > 0, a => statusList.Contains(a.mo_task_status))
.WhereIF(status == "3" && start_time != null, a => a.act_end_date >= start_time) .WhereIF(status == "3" && start_time != null, a => a.act_end_date >= start_time)
.WhereIF(status == "3" && end_time != null, a => a.act_end_date <= end_time) .WhereIF(status == "3" && end_time != null, a => a.act_end_date <= end_time)
.Where((a, b, c, d, e, f, g, h, j, k, l,m)=>(m.ManagerId==userId) .WhereIF(!_userManager.IsAdministrator,(a, b, c, d, e, f, g, h, j, k, l,m)=>(m.ManagerId==userId)
|| (j.mo_type==DictConst.PrdMoTypeBZ && !SqlFunc.IsNullOrEmpty(userWorklineId) && a.workline_id==userWorklineId)
|| (a.schedule_type==1 && a.mo_task_status==DictConst.ToBeStartedEnCode && moldUserIds.Contains(userId)) || (a.schedule_type==1 && a.mo_task_status==DictConst.ToBeStartedEnCode && moldUserIds.Contains(userId))
|| (a.scheduling_class_type=="1" && twoDayFlag && a.dayshift_worker_id==userId) || (a.scheduling_class_type=="1" && twoDayFlag && a.dayshift_worker_id==userId)
|| (a.scheduling_class_type=="1" && twoNightFlag && a.nightshift_worker_id==userId) || (a.scheduling_class_type=="1" && twoNightFlag && a.nightshift_worker_id==userId)

6
QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
View File

@@ -14,6 +14,7 @@ using Tnb.BasicData.Entities;
using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities; using Tnb.ProductionMgr.Entities;
using Tnb.QcMgr.Entities; using Tnb.QcMgr.Entities;
using Tnb.BasicData;
namespace Tnb.QcMgr namespace Tnb.QcMgr
{ /// <summary> { /// <summary>
@@ -99,6 +100,8 @@ namespace Tnb.QcMgr
{ "await", "待检" }, { "await", "待检" },
{ "temporarily", "暂控" } { "temporarily", "暂控" }
}; };
PositionEntity positionEntity = await db.Queryable<PositionEntity>().Where(x=>x.Id==_userManager.User.PositionId).FirstAsync();
Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>(); Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : ""; string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : "";
string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : ""; string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : "";
@@ -117,6 +120,9 @@ namespace Tnb.QcMgr
.LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id) .LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id)
.LeftJoin<PrdMoTask>((a,b,c,d,e,f)=>a.mo_task_code==f.mo_task_code) .LeftJoin<PrdMoTask>((a,b,c,d,e,f)=>a.mo_task_code==f.mo_task_code)
.LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>f.eqp_id==g.id) .LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>f.eqp_id==g.id)
.LeftJoin<OrganizeEntity>((a,b,c,d,e,f,g,h)=>d.OrganizeIdTree.Contains(h.Id) && h.Category == DictConst.RegionCategoryWorklineCode)
.LeftJoin<PositionEntity>((a,b,c,d,e,f,g,h,i)=>h.Id==i.OrganizeId)
.WhereIF(_userManager.LoginType=="app" && !_userManager.IsAdministrator,(a,b,c,d,e,f,g,h,i)=>i.EnCode==positionEntity.EnCode)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid) .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid)
.WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype) .WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype)
.WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status) .WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status)

18
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -358,12 +358,12 @@ namespace Tnb.WarehouseMgr
List<String> materialIds = Arrays.AsList(instock.material_id); List<String> materialIds = Arrays.AsList(instock.material_id);
List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
// List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
// List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>() List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
// .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId) .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
// .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
// .Select((x, y) => y) .Select((x, y) => y)
// .ToListAsync(); .ToListAsync();
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync(); List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId; string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId;
@@ -373,8 +373,8 @@ namespace Tnb.WarehouseMgr
tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
tableIds.AddRange(materialIds); tableIds.AddRange(materialIds);
tableIds.Add(supplierId); tableIds.Add(supplierId);
// tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
tableIds.AddRange(unitIds); // tableIds.AddRange(unitIds);
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
@@ -422,7 +422,7 @@ namespace Tnb.WarehouseMgr
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["csourcebillhid"] = prdReport?.erp_pk_wr ?? "", ["csourcebillhid"] = prdReport?.erp_pk_wr ?? "",
["csourcebillbid"] = prdReport?.erp_pk_wr_product ?? "", ["csourcebillbid"] = prdReport?.erp_pk_wr_product ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == item.unit_id)?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "",
["dbizdate"] = instock.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), ["dbizdate"] = instock.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),

4
WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs
View File

@@ -69,6 +69,7 @@ namespace Tnb.WarehouseMgr
BasLocation endLocation = await _db.Queryable<BasLocation>().Where(r => r.id == input.wmsDistaskH.endlocation_id).FirstAsync(); BasLocation endLocation = await _db.Queryable<BasLocation>().Where(r => r.id == input.wmsDistaskH.endlocation_id).FirstAsync();
string outWhid = ""; string outWhid = "";
string inWhid = "";
string outDeptid = ""; string outDeptid = "";
string outDeptvid = ""; string outDeptvid = "";
string inDeptid = ""; string inDeptid = "";
@@ -79,6 +80,7 @@ namespace Tnb.WarehouseMgr
if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_MJC_ID) if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_MJC_ID)
{ {
outWhid = WmsWareHouseConst.bipwarehouseid_bz; outWhid = WmsWareHouseConst.bipwarehouseid_bz;
inWhid = WmsWareHouseConst.bipwarehouseid_mj;
outDeptid = WmsWareHouseConst.sichangqushengchanbu_id; outDeptid = WmsWareHouseConst.sichangqushengchanbu_id;
outDeptvid = WmsWareHouseConst.sichangqushengchanbu_vid; outDeptvid = WmsWareHouseConst.sichangqushengchanbu_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id; inDeptid = WmsWareHouseConst.sichangqucangku_id;
@@ -90,6 +92,7 @@ namespace Tnb.WarehouseMgr
else if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID) else if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID)
{ {
outWhid = WmsWareHouseConst.bipwarehouseid_mj; outWhid = WmsWareHouseConst.bipwarehouseid_mj;
inWhid = WmsWareHouseConst.bipwarehouseid_cp;
outDeptid = WmsWareHouseConst.sichangqucangku_id; outDeptid = WmsWareHouseConst.sichangqucangku_id;
outDeptvid = WmsWareHouseConst.sichangqucangku_vid; outDeptvid = WmsWareHouseConst.sichangqucangku_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id; inDeptid = WmsWareHouseConst.sichangqucangku_id;
@@ -144,6 +147,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("cwarehouseid", outWhid);//先写死 erpRequestData.Add("cwarehouseid", outWhid);//先写死
erpRequestData.Add("cotherwhid", inWhid);//先写死
erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss")); erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate", nowStr); erpRequestData.Add("dmakedate", nowStr);
erpRequestData.Add("dshldarrivedate", nowStr); erpRequestData.Add("dshldarrivedate", nowStr);