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

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> unitIds = 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>()
// .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
// .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
// .Select((x, y) => y)
// .ToListAsync();
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
.Select((x, y) => y)
.ToListAsync();
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId;
@@ -373,8 +373,8 @@ namespace Tnb.WarehouseMgr
tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
tableIds.AddRange(materialIds);
tableIds.Add(supplierId);
// tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
tableIds.AddRange(unitIds);
tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
// tableIds.AddRange(unitIds);
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 ?? "";
@@ -422,7 +422,7 @@ namespace Tnb.WarehouseMgr
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["csourcebillhid"] = prdReport?.erp_pk_wr ?? "",
["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 ?? "",
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "",
["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();
string outWhid = "";
string inWhid = "";
string outDeptid = "";
string outDeptvid = "";
string inDeptid = "";
@@ -79,6 +80,7 @@ namespace Tnb.WarehouseMgr
if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_MJC_ID)
{
outWhid = WmsWareHouseConst.bipwarehouseid_bz;
inWhid = WmsWareHouseConst.bipwarehouseid_mj;
outDeptid = WmsWareHouseConst.sichangqushengchanbu_id;
outDeptvid = WmsWareHouseConst.sichangqushengchanbu_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id;
@@ -90,6 +92,7 @@ namespace Tnb.WarehouseMgr
else if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID)
{
outWhid = WmsWareHouseConst.bipwarehouseid_mj;
inWhid = WmsWareHouseConst.bipwarehouseid_cp;
outDeptid = WmsWareHouseConst.sichangqucangku_id;
outDeptvid = WmsWareHouseConst.sichangqucangku_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id;
@@ -144,6 +147,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("cwarehouseid", outWhid);//先写死
erpRequestData.Add("cotherwhid", inWhid);//先写死
erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate", nowStr);
erpRequestData.Add("dshldarrivedate", nowStr);