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:
alex
2023-08-03 17:47:53 +08:00
parent 3273ac0cec 1e65480fd7
commit 78c09c9548
7 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,8 +173,13 @@ namespace Tnb.ProductionMgr
{
var moTask = await db.Queryable<PrdMoTask>().FirstAsync(x => x.id == input.mo_task_id);
var parentMoTask = await db.Queryable<PrdMoTask>().FirstAsync(x => x.id == moTask.parent_id);
string worklineId = moTask.workline_id;
if (parentMoTask != null && !string.IsNullOrEmpty(parentMoTask.workline_id))
{
worklineId = parentMoTask.workline_id;
}
var carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.carry_code == input.carry_code);
var workline = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == parentMoTask.workline_id);
var workline = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == worklineId);
var workshop = await db.Queryable<OrganizeEntity>().SingleAsync(x=>x.Id==workline.ParentId);
var inputMaterials = await db.Queryable<BasMbomInput>()
.Where(x => x.mbom_id == moTask.bom_id && x.mbom_process_id == moTask.mbom_process_id)

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs
View File

@@ -17,6 +17,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// </summary>
public string carry_id { get; set; }
/// <summary>
/// 载具规格Id
/// </summary>
public string carrystd_id { get; set; }
/// <summary>
/// 物料Id
/// </summary>
public string material_id { get; set; }

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

@@ -192,17 +192,18 @@ namespace Tnb.WarehouseMgr
.And((a, b, c) => a.out_status == "0")
.And((a, b, c) => c.wh_id == input.warehouse_id)
.AndIF(!string.IsNullOrEmpty(input.material_id), (a, b, c) => b.material_id == input.material_id)
.AndIF(!string.IsNullOrEmpty(input.code_batch), (a, b, c) => b.code_batch == input.code_batch);
.AndIF(!string.IsNullOrEmpty(input.code_batch), (a, b, c) => b.code_batch == input.code_batch)
.AndIF(!string.IsNullOrEmpty(input.carrystd_id), (a,b,c)=>a.carrystd_id == input.carrystd_id);
Expression<Func<WmsCarryH, WmsCarryCode, BasLocation, bool>> carryStatusFilterExp = !input.material_id.IsNullOrWhiteSpace()
? (a, b, c) => a.status == (int)EnumCarryStatus.占用
: (a, b, c) => a.status == (int)EnumCarryStatus.空闲;
? (a, b, c) => a.carry_status == ((int)EnumCarryStatus.占用).ToString()
: (a, b, c) => a.carry_status == ((int)EnumCarryStatus.空闲).ToString();
whereExprable.And(carryStatusFilterExp);
var whereExpr = whereExprable.ToExpression();
var policy = await _db.Queryable<WmsInstockPolicies>().Where(it => it.status == 1).FirstAsync();
if (policy == null) throw new AppFriendlyException("没有可用策略", 500);
var items = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
.InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
var items = await _db.Queryable<WmsCarryH>().LeftJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
.LeftJoin<BasLocation>((a, b, c) => a.location_id == c.id)
.Where(whereExpr)
.OrderBy(policy.policy)
.Select<WmsCarryH>()

31
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
View File

@@ -77,13 +77,20 @@ namespace Tnb.WarehouseMgr
//判断目标库位是否自动签收
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
//出库取起点，获取所有符合输入的载具规格的载具
var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString() };
var outStkCarrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
var OutStockStrategyInput = new OutStockStrategyQuery {
carrystd_id = input.data[nameof(OutStockStrategyQuery.carrystd_id)].ToString(),
warehouse_id = input.data[nameof(OutStockStrategyQuery.warehouse_id)].ToString(),
};
var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
//var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
// .Where((a, b) => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()
// && a.carry_status == ((int)EnumCarryStatus.空闲).ToString() && a.is_lock == 0 && b.is_lock == 0 && b.is_type == ((int)EnumLocationType.存储库位).ToString())
// .ToListAsync();
// 判断最终目标库位是否可以放置当前载具
if (outStkCarrys?.Count > 0)
if (carrys?.Count > 0)
{
var curCarry = outStkCarrys[^outStkCarrys.Count];
var curCarry = carrys[^carrys.Count];
var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, loc);
if (!isMatch) throw new AppFriendlyException("该载具无法放置到目标库位", 500);
}
@@ -99,12 +106,12 @@ namespace Tnb.WarehouseMgr
ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString() && it.is_lock == 0);
}
//根据每个载具的起始库位做路径运算
if (outStkCarrys?.Count > 0)
if (carrys?.Count > 0)
{
int min = (outStkCarrys.Count > setQty.qty) ? setQty.qty : outStkCarrys.Count;
int min = (carrys.Count > setQty.qty) ? setQty.qty : carrys.Count;
for (int i = 0; i < min; i++)
{
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == outStkCarrys[i].location_id);
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[i].location_id);
var isOk = false;
if (sPoint != null && ePoint != null)
@@ -136,8 +143,8 @@ namespace Tnb.WarehouseMgr
status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID,
task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID,
carry_id = outStkCarrys![i].id,
carry_code = outStkCarrys![i].carry_code,
carry_id = carrys![i].id,
carry_code = carrys![i].carry_code,
area_id = sPoint?.area_id!,
area_code = it.Key,
require_id = input.data["ReturnIdentity"].ToString(),
@@ -161,7 +168,7 @@ namespace Tnb.WarehouseMgr
GenPreTaskUpInput preTaskUpInput = new()
{
RquireId = input.data["ReturnIdentity"].ToString()!,
CarryId = outStkCarrys![i].id,
CarryId = carrys![i].id,
CarryStartLocationId = points!.FirstOrDefault()!.location_id!,
CarryStartLocationCode = points!.FirstOrDefault()!.location_code!,
LocationIds = points!.Select(x => x.location_id).ToList()!
@@ -175,8 +182,8 @@ namespace Tnb.WarehouseMgr
biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID,
location_id = ePoint.location_id!,
status = WmsWareHouseConst.BILLSTATUS_ON_ID,
carry_id = outStkCarrys[i].id,
carry_code = outStkCarrys[i].carry_code,
carry_id = carrys[i].id,
carry_code = carrys[i].carry_code,
create_id = _userManager.UserId,
create_time = DateTime.Now
};

2
WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
View File

@@ -301,7 +301,7 @@ namespace Tnb.WarehouseMgr
x.id = SnowflakeIdHelper.NextId();
x.bill_id = input.requireId;
x.bill_d_id = billDId!;
x.org_id = _userManager.User.OrganizeId;
x.org_id = ssds?.Select(xx=>xx.org_id).FirstOrDefault() ?? string.Empty;
x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
});

21
system/Tnb.Systems/Permission/DepartmentService.cs
View File

@@ -687,6 +687,27 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
return null;
}
/// <summary>
/// 根据工位id获取车间信息
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetWorkshopByWorkstationId(Dictionary<string, string> dic)
{
string id = dic["id"];
var db = _repository.AsSugarClient();
OrganizeEntity organizeEntity = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == id);
if (organizeEntity != null && !string.IsNullOrEmpty(organizeEntity.OrganizeIdTree))
{
string[] arr = organizeEntity.OrganizeIdTree.Split(",");
return await db.Queryable<OrganizeEntity>().SingleAsync(x => arr.Contains(x.Id) && x.Category == DictConst.RegionCategoryWorkshopCode);
}
return null;
}
#endregion

13
system/Tnb.Systems/System/DataInterfaceService.cs
View File

@@ -39,6 +39,7 @@ using Mapster;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
@@ -559,7 +560,17 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
{
try
{
return (await Preview(id, input)).ToObject<List<Dictionary<string, object>>>().FirstOrDefault().Keys.ToList();
//modifyby zhoukeda 20230803
var result = await Preview(id, input);
if (result is DataTable)
{
List<Dictionary<string,Object>> list = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(result));
return list.FirstOrDefault()?.Keys.ToList() ?? Enumerable.Empty<string>();
}
else
{
return result.ToObject<List<Dictionary<string, object>>>().FirstOrDefault().Keys.ToList();
}
}
catch (Exception e)
{