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:
yang.lee
2023-11-07 18:02:08 +08:00
parent ea44abf6af f16f89e86a
commit ac01098baa
37 changed files with 1105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs
View File

@@ -29,6 +29,11 @@ namespace Tnb.BasicData
/// 生产齐套领料
/// </summary>
public const string PRDKITTINGOUTSTOCK_CODE = "PrdKittingOutStocK";
/// <summary>
/// 生产领料
/// </summary>
public const string PRDOUTSTOCK_CODE = "PrdOutstock";
/// <summary>
/// 设备维修单

7
BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
View File

@@ -32,5 +32,12 @@ namespace Tnb.BasicData.Interfaces
/// <param name="dic"></param>
/// <returns></returns>
public Task<dynamic> GetMaterialByQueryJson(MaterialQueryInput input);
/// <summary>
/// 获取物料的入库仓库
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
public Task<dynamic> GetInboundWarehouseById(Dictionary<string, string> dic);
}
}

16
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -220,6 +220,22 @@ namespace Tnb.BasicData
}
[HttpPost]
public async Task<dynamic> GetInboundWarehouseById(Dictionary<string, string> dic)
{
string id = dic.ContainsKey("id") ? dic["id"] : "";
return await _repository.AsSugarClient().Queryable<BasMaterialInboundWh>()
.LeftJoin<BasWarehouse>((a, b) => a.wh_id == b.id)
.Where((a, b) => a.material_id == id)
.Select((a, b) => new
{
warehouse_id = a.wh_id,
warehouse_code = b.whcode,
warehouse_name = b.whname
}).ToListAsync();
}
/// <summary>
/// 获取物料清单下所子集物料id
/// </summary>

2
Directory.Build.props
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);CS1591;</NoWarn>
<NoWarn>$(NoWarn);CS1570;CS1587;CS1591;CS8601;CS8602;CS8603;CS8618;</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

5
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpDaq.cs
View File

@@ -18,6 +18,11 @@ public partial class EqpDaq : BaseEntity<string>
/// 数据源
/// </summary>
public string data_source { get; set; } = string.Empty;
/// <summary>
/// 机号
/// </summary>
public string? equip_code { get; set; }
/// <summary>
/// 标签名称

5
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
View File

@@ -208,11 +208,6 @@ public partial class EqpEquipment : BaseEntity<string>
/// </summary>
public string? qrcode { get; set; }
/// <summary>
/// 挤出件类型
/// </summary>
public string? tube { get; set; }
/// <summary>
/// 入库库位id
/// </summary>

36
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingInput.cs Normal file
View File

@@ -0,0 +1,36 @@
namespace Tnb.ProductionMgr.Entities.Dto
{
public class FeedingInput
{
/// <summary>
/// 工位id
/// </summary>
public string station_id { get; set; } = string.Empty;
// /// <summary>
// /// 任务单id
// /// </summary>
// public string? mo_task_id { get; set; }
//
// /// <summary>
// /// 设备id
// /// </summary>
// public string? equip_id { get; set; }
/// <summary>
/// 二维码信息
/// </summary>
public string? carry_code { get; set; }
public List<FeedingDInput> details { get; set; } = new List<FeedingDInput>();
}
public class FeedingDInput
{
public string material_id { get; set; }
public string code_batch { get; set; }
public string unit_id { get; set; }
public decimal codeqty { get; set; }
}
}

11
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordInfoInput.cs Normal file
View File

@@ -0,0 +1,11 @@
using JNPF.Common.Filter;
namespace Tnb.ProductionMgr.Entities.Dto
{
public class FeedingRecordInfoInput
{
public string id { get; set; }
public string type { get; set; }
}
}

19
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordInfoOutput.cs Normal file
View File

@@ -0,0 +1,19 @@
using JNPF.Common.Filter;
namespace Tnb.ProductionMgr.Entities.Dto
{
public class FeedingRecordInfoOutput
{
public string id { get; set; }
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
public decimal? num { get; set; }
public string unit_name { get; set; }
}
}

12
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordListInput.cs Normal file
View File

@@ -0,0 +1,12 @@
using JNPF.Common.Filter;
namespace Tnb.ProductionMgr.Entities.Dto
{
public class FeedingRecordListInput : PageInputBase
{
/// <summary>
/// 工位id
/// </summary>
public string stationId { get; set; }
}
}

15
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordListOutput.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Tnb.ProductionMgr.Entities.Dto
{
public class FeedingRecordListOutput
{
public string id { get; set; }
public string code { get; set; }
public string type_name { get; set; }
public string type { get; set; }
public string create_name { get; set; }
public string create_time { get; set; }
public string status { get; set; }
}
}

1
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs
View File

@@ -3,6 +3,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class InstockInput
{
public string equip_code { get; set; }
public string label_code { get; set; }
public string as_location_code { get; set; }
}
}

29
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialOutstockInput.cs Normal file
View File

@@ -0,0 +1,29 @@
namespace Tnb.ProductionMgr.Entities.Dto
{
public class MaterialOutstockInput
{
/// <summary>
/// 目标库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// 所属工位
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// 任务单
/// </summary>
public string? mo_task_id { get; set; }
public List<MaterialOutstockDInput> details { get; set; } = new List<MaterialOutstockDInput>();
}
public class MaterialOutstockDInput
{
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
public decimal num { get; set; }
}
}

1
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialPreparationPlanOutput.cs
View File

@@ -26,6 +26,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public string material_id { get; set; }
public string material_code { get; set; }
public string category_id { get; set; }
public decimal? num { get; set; }
}
}

5
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs
View File

@@ -60,5 +60,10 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string? mbom_process_id { get; set; }
public List<Dictionary<string, object>>? details { get; set; }
/// <summary>
/// 存在不属于该任务单的原材料也要签收
/// </summary>
public bool sure { get; set; } = false;
}
}

37
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/NewMaterialReceiptInput.cs Normal file
View File

@@ -0,0 +1,37 @@
namespace Tnb.ProductionMgr.Entities.Dto
{
public class NewMaterialReceiptInput
{
/// <summary>
/// 工位id
/// </summary>
public string station_id { get; set; } = string.Empty;
/// <summary>
/// 载具编号
/// </summary>
public string? carry_code { get; set; }
public List<NewMaterialReceiptDInput>? details { get; set; } = new List<NewMaterialReceiptDInput>();
/// <summary>
/// 存在不属于该任务单的原材料也要签收
/// </summary>
public bool sure { get; set; } = false;
}
public class NewMaterialReceiptDInput
{
public string material_id{get;set;}
public decimal codeqty {get;set;}
public string code_batch {get;set;}
public string unit_id {get;set;}
public string barcode {get;set;}
public string member_carryid {get;set;}
public string member_carrycode {get;set;}
public string supplier_id {get;set;}
public DateTime? instock_time {get;set;}
public string check_conclusion {get;set;}
}
}

20
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs
View File

@@ -127,10 +127,6 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// </summary>
public string? act_end_date { get; set; }
/// <summary>
/// 挤出件类型
/// </summary>
public string? tube { get; set; }
/// <summary>
/// 最小包装
/// </summary>
public decimal? minpacking { get; set; }
@@ -154,5 +150,21 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 称重点位名称
/// </summary>
public string? weight_name { get; set; }
/// <summary>
/// 物料分类ID
/// </summary>
public string category_id { get; set; } = string.Empty;
/// <summary>
/// 入库仓库id
/// </summary>
public string warehouse_id { get; set; }
public string warehouse_code { get; set; }
public string warehouse_name { get; set; }
}
}

5
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdKittingOutH.cs
View File

@@ -93,5 +93,10 @@ public partial class PrdKittingOutH : BaseEntity<string>
/// 任务单
/// </summary>
public string? mo_task_id { get; set; }
/// <summary>
/// 状态 1 待配送 2 已完成
/// </summary>
public string status { get; set; }
}

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMaterialReceiptD.cs
View File

@@ -77,7 +77,7 @@ public partial class PrdMaterialReceiptD : BaseEntity<string>
/// <summary>
/// 入库时间
/// </summary>
public DateTime instock_time { get; set; }
public DateTime? instock_time { get; set; }
/// <summary>
/// 检验结论
/// </summary>

16
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs
View File

@@ -14,6 +14,7 @@ public partial class PrdOutstockH : BaseEntity<string>
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 出库单创建日期
/// </summary>
@@ -23,6 +24,11 @@ public partial class PrdOutstockH : BaseEntity<string>
/// 单据类型
/// </summary>
public string? bill_type { get; set; }
/// <summary>
/// 单据类型 1 一般出库 2 物料出库
/// </summary>
public string? type { get; set; }
/// <summary>
/// 发料仓库id
@@ -38,6 +44,11 @@ public partial class PrdOutstockH : BaseEntity<string>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 所属组织
@@ -58,6 +69,11 @@ public partial class PrdOutstockH : BaseEntity<string>
/// 所属产线
/// </summary>
public string? workline { get; set; }
/// <summary>
/// 状态 1 待配送 2 已完成
/// </summary>
public string status { get; set; }
/// <summary>
/// 流程任务Id

5
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs
View File

@@ -129,5 +129,10 @@ public partial class PrdReport : BaseEntity<string>
/// 料箱编号
/// </summary>
public string material_box_code { get; set; }
/// <summary>
/// 长管挤出入库库位
/// </summary>
public string location_code { get; set; }
}

7
ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs
View File

@@ -36,5 +36,12 @@ namespace Tnb.ProductionMgr.Interfaces
/// <param name="input"></param>
/// <returns></returns>
public Task<string> InstockTubeOne(PrdReport prdReport);
/// <summary>
/// 长管管挤出入库申请
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public Task<string> InstockTubeThree(PrdReport prdReport);
}
}

6
ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdOutstockService.cs
View File

@@ -12,5 +12,11 @@ namespace Tnb.ProductionMgr.Interfaces
/// </summary>
/// <returns></returns>
public Task<dynamic> GeneralOutstock(GeneralOutstockInput input);
/// <summary>
/// 物料出库申请
/// </summary>
/// <returns></returns>
public Task<dynamic> MaterialOutstock(MaterialOutstockInput input);
}
}

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

@@ -1,12 +1,15 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities;
@@ -335,7 +338,7 @@ namespace Tnb.ProductionMgr
/// <exception cref="Exception"></exception>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost]
public async Task<dynamic> Feeding(MaterialReceiptNewInput input)
public async Task<dynamic> Feeding(FeedingInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
PrdMoTask moTask = await _prdMoTaskService.GetPrdMoTaskInfoByStationId(new Dictionary<string, string>()
@@ -375,7 +378,7 @@ namespace Tnb.ProductionMgr
station_id = input.station_id,
mo_task_id = moTask.id,
process_id = moTask.process_id,
equip_id = input.equip_id,
// equip_id = input.equip_id,
workshop_id = workshop?.Id,
carry_id = carry.id,
workline_id = moTask.workline_id,
@@ -389,24 +392,24 @@ namespace Tnb.ProductionMgr
if (input.details != null && input.details.Count > 0)
{
foreach (Dictionary<string, string> item in input.details)
foreach (var item in input.details)
{
if (!inputMaterials.Contains(item["material_id"]))
{
throw new Exception("该物料不是生产bom投入物料，不能签收");
}
// if (!inputMaterials.Contains(item["material_id"]))
// {
// throw new Exception("该物料不是生产bom投入物料，不能签收");
// }
PrdMaterialReceiptD? detail = await db.Queryable<PrdMaterialReceiptD>()
.Where(x => x.member_carry_code == input.carry_code && x.is_all_feeding == 0).FirstAsync();
decimal num = Convert.ToDecimal(item["num"]);
decimal num = item.codeqty;
list.Add(new PrdFeedingD
{
feeding_id = prdFeedingH.id,
material_receipt_detail_id = detail?.id,
material_id = item["material_id"],
material_id = item.material_id,
num = num,
batch = item["batch"],
unit_id = item["unit_id"],
batch = item.code_batch,
unit_id = item.unit_id,
carry_id = carry.id,
status = "0",
use_num = 0,
@@ -440,7 +443,7 @@ namespace Tnb.ProductionMgr
}
else
{
throw new Exception("没有签收物料");
throw new Exception("没有签收物料，无法投料");
}
@@ -450,7 +453,7 @@ namespace Tnb.ProductionMgr
});
return !result.IsSuccess ? throw Oops.Bah(result.ErrorMessage) : (dynamic)(result.IsSuccess ? "签收成功" : result.ErrorMessage);
return !result.IsSuccess ? throw Oops.Bah(result.ErrorMessage) : (dynamic)(result.IsSuccess ? "投料成功" : result.ErrorMessage);
}
[HttpPost]
@@ -496,5 +499,112 @@ namespace Tnb.ProductionMgr
.ToListAsync();
return result;
}
/// <summary>
/// pad app 领料记录列表
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> FeedingRecordList(FeedingRecordListInput input)
{
if (string.IsNullOrEmpty(input.stationId))
{
return new
{
pagination = new PageResult(),
list = Array.Empty<string>()
};
}
var db = _repository.AsSugarClient();
Dictionary<string, object> queryJson = string.IsNullOrEmpty(input.queryJson) ? new Dictionary<string, object>() : input.queryJson.ToObject<Dictionary<string, object>>();
string? code = queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
// DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null;
// DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null;
if (string.IsNullOrEmpty(input.sidx))
{
input.sidx = "create_time";
input.sort = "desc";
}
var queryable1 = db.Queryable<PrdKittingOutH>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.Where((a,b)=>a.workstation_id==input.stationId)
.Select((a, b) => new FeedingRecordListOutput()
{
id = a.id,
code = a.code,
type_name = "齐套出库",
type = "0",
create_name = b.RealName,
create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS),
status = a.status
});
var queryable2 = db.Queryable<PrdOutstockH>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.Where((a,b)=>a.workstation==input.stationId)
.Select((a, b) => new FeedingRecordListOutput()
{
id = a.id,
code = a.bill_code,
type_name = a.type=="1" ? "一般出库" : "物料出库",
type = a.type,
create_name = b.RealName,
create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS),
status = a.status
});
var result = await db.UnionAll(queryable1,queryable2)
.MergeTable()
.OrderBy($"{input.sidx} {input.sort}")
.ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<FeedingRecordListOutput>.SqlSugarPageResult(result);
}
[HttpPost]
public async Task<dynamic> GetFeedingRecordInFoById(FeedingRecordInfoInput input)
{
var db = _repository.AsSugarClient();
if (input.type == "0")
{
var result = db.Queryable<PrdKittingOutD>()
.LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
.LeftJoin<DictionaryTypeEntity>((a,b,c)=>c.EnCode==DictConst.MeasurementUnit)
.LeftJoin<DictionaryDataEntity>((a,b,c,d)=>d.DictionaryTypeId==c.Id && a.unit_id==d.Id)
.Where((a, b) => a.kitting_out_id == input.id)
.Select((a, b,c,d) => new FeedingRecordInfoOutput
{
id = a.id,
material_id = a.material_id,
material_code = b.code,
material_name = b.name,
num = a.pr_qty,
unit_name = d.FullName
}).ToListAsync();
return result;
}
else
{
var result = db.Queryable<PrdOutstockD>()
.LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
.LeftJoin<DictionaryTypeEntity>((a,b,c)=>c.EnCode==DictConst.MeasurementUnit)
.LeftJoin<DictionaryDataEntity>((a,b,c,d)=>d.DictionaryTypeId==c.Id && a.unit_id==d.Id)
.Where((a, b) => a.outstock_id == input.id)
.Select((a, b,c,d) => new FeedingRecordInfoOutput
{
id = a.id,
material_id = a.material_id,
material_code = b.code,
material_name = b.name,
num = a.pr_qty,
unit_name = d.FullName
}).ToListAsync();
return result;
}
}
}
}

133
ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs
View File

@@ -262,14 +262,25 @@ namespace Tnb.ProductionMgr
public async Task<dynamic> InstockTypeOne(InstockInput inut)
{
string equip_code = inut.equip_code;
string label_code = inut.label_code;
string as_location_code = inut.as_location_code;
string warehouse_id = "2";
if (!string.IsNullOrEmpty(equip_code))
{
throw Oops.Bah("请传机台号");
}
if (!string.IsNullOrEmpty(label_code))
{
throw Oops.Bah("请传标签号");
}
ISqlSugarClient db = _repository.AsSugarClient();
EqpEquipment equipment = await db.Queryable<EqpEquipment>().Where(x => x.code == equip_code).FirstAsync();
EqpEquipment equipment = await db.Queryable<EqpEquipment>()
.LeftJoin<EqpDaq>((x,y)=>x.id==y.equip_id)
.Where((x,y) => y.equip_code==equip_code && y.label_name==label_code && y.label_point=="提报装箱称重点位")
.Select((x,y)=>x)
.FirstAsync();
if (equipment == null)
{
throw Oops.Bah("未找到机台");
@@ -315,7 +326,8 @@ namespace Tnb.ProductionMgr
workline_id = workline?.Id ?? "",
workshop_id = workshop?.Id ?? "",
org_id = _userManager.GetUserInfo().Result.organizeId,
warehouse_id = basLocation?.wh_id,
// warehouse_id = basLocation?.wh_id,
warehouse_id = warehouse_id,
status = 0,
};
@@ -341,7 +353,8 @@ namespace Tnb.ProductionMgr
org_id = _userManager.GetUserInfo().Result.organizeId,
bill_date = DateTime.Now,
bill_type = DictConst.CHANCHENGPINRUKUDAN,
warehouse_id = basLocation?.wh_id,
// warehouse_id = basLocation?.wh_id,
warehouse_id = warehouse_id,
source_id = prdInstockH.id,
create_id = _userManager.UserId,
carry_code = prdReport.material_box_code,
@@ -397,8 +410,118 @@ namespace Tnb.ProductionMgr
public async Task<string> InstockTubeOne(PrdReport prdReport)
{
ISqlSugarClient db = _repository.AsSugarClient();
string location_code = "JMXHC-01";
string warehouse_id = "26103348825381";
string location_code = "ZCR01";//todo 短管挤出件目标库位之后改
string warehouse_id = "2";
PrdInstockH? prdInstockH = null;
List<PrdInstockD> prdInstockDs = new() { };
DbResult<bool> result2 = new();
BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdReport.material_id);
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(prdReport.station, DictConst.RegionCategoryWorklineCode);
OrganizeEntity workshop = await _organizeService.GetAnyParentByWorkstationId(prdReport.station, DictConst.RegionCategoryWorkshopCode);
prdInstockH = new PrdInstockH()
{
bill_type = DictConst.CHANCHENGPINRUKUDAN,
bill_date = DateTime.Now,
create_id = _userManager.UserId,
location_code = location_code,
carry_code = prdReport.material_box_code,
is_check = 1,
station_id = prdReport.station,
workline_id = workline?.Id ?? "",
workshop_id = workshop?.Id ?? "",
org_id = _userManager.GetUserInfo().Result.organizeId,
warehouse_id = warehouse_id,
status = 0,
};
prdInstockDs.Add(new PrdInstockD()
{
instock_id = prdInstockH.id,
report_id = prdReport.create_id,
material_id = prdReport.material_id,
material_code = basMaterial.code,
unit_id = prdReport.unit_id,
barcode = prdReport.barcode,
code_batch = prdReport.barcode + "0001",
quantity = (int)prdReport.reported_qty,
});
});
if (result.IsSuccess)
{
MESCreateInstockInput mesCreateInstockInput = new()
{
instock = new MESWmsInstockHInput()
{
org_id = _userManager.GetUserInfo().Result.organizeId,
bill_date = DateTime.Now,
bill_type = DictConst.CHANCHENGPINRUKUDAN,
warehouse_id = warehouse_id,
source_id = prdInstockH.id,
create_id = _userManager.UserId,
carry_code = prdReport.material_box_code,
location_code = location_code,
is_check = 1,
},
instockds = new List<MESWmsInstockDInput>(),
instockcodes = new List<MESWmsInstockCodeInput>()
};
mesCreateInstockInput.instockds.Add(new MESWmsInstockDInput()
{
material_id = prdReport.material_id,
material_code = basMaterial.code,
unit_id = prdReport.unit_id,
code_batch = prdReport.barcode,
pr_qty = (int)prdReport.reported_qty,
});
mesCreateInstockInput.instockcodes.Add(new MESWmsInstockCodeInput()
{
material_id = prdReport.material_id,
material_code = basMaterial.code,
unit_id = prdReport.unit_id,
barcode = prdReport.barcode,
code_batch = prdReport.barcode + "0001",
codeqty = (int)prdReport.reported_qty,
});
string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
Dictionary<string, object> header = new()
{
["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
};
string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header);
Log.Information(sendResult);
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(sendResult);
result2 = authResponse.code != 200 || !authResponse.data.ObjToBool()
? throw Oops.Bah(authResponse.msg)
: await db.Ado.UseTranAsync(async () =>
{
_ = await _repository.InsertAsync(prdInstockH);
if (prdInstockDs.Count > 0)
{
_ = await db.Insertable<PrdInstockD>(prdInstockDs).ExecuteCommandAsync();
}
});
}
return result2.IsSuccess ? "true" : "false";
}
/// <summary>
/// 长管管挤出入库申请
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<string> InstockTubeThree(PrdReport prdReport)
{
ISqlSugarClient db = _repository.AsSugarClient();
string location_code = prdReport.location_code;
string warehouse_id = "27209786980373";//长件挤出缓存仓
PrdInstockH? prdInstockH = null;
List<PrdInstockD> prdInstockDs = new() { };

128
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -34,12 +34,13 @@ namespace Tnb.ProductionMgr
private readonly IUserManager _userManager;
private readonly IOrganizeService _organizeService;
private readonly IBillRullService _billRullService;
private readonly IPrdMoTaskService _prdMoTaskService;
public PrdMaterialReceiptService(
ISqlSugarRepository<PrdMaterialReceiptH> repository,
IBillRullService billRullService,
IOrganizeService organizeService,
IPrdMoTaskService prdMoTaskService,
IUserManager userManager
)
{
@@ -47,6 +48,7 @@ namespace Tnb.ProductionMgr
_userManager = userManager;
_organizeService = organizeService;
_billRullService = billRullService;
_prdMoTaskService = prdMoTaskService;
}
@@ -243,5 +245,129 @@ namespace Tnb.ProductionMgr
? throw Oops.Bah(result.ErrorMessage)
: !result2.IsSuccess ? throw Oops.Bah(result2.ErrorMessage) : (dynamic)"签收成功";
}
[HttpPost]
public async Task<dynamic> SaveDataNew(NewMaterialReceiptInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
PrdMoTask moTask = await _prdMoTaskService.GetPrdMoTaskInfoByStationId(new Dictionary<string, string>(){
{"station_id",input.station_id}
});
DbResult<bool> result2 = new();
PrdMaterialReceiptH? prdMaterialReceiptH = null;
List<PrdMaterialReceiptD> list = new();
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
List<string> inputMaterials = await db.Queryable<BasMbomInput>()
.Where(x => x.mbom_id == moTask.bom_id)
.WhereIF(!string.IsNullOrEmpty(moTask.mbom_process_id), x => x.mbom_process_id == moTask.mbom_process_id)
.Select(x => x.material_id)
.ToListAsync();
string code = await _billRullService.GetBillNumber(Tnb.BasicData.CodeTemplateConst.MATERIAL_RECEIPT_CODE);
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(input.station_id, DictConst.RegionCategoryWorklineCode);
OrganizeEntity workshop = await _organizeService.GetAnyParentByWorkstationId(input.station_id, DictConst.RegionCategoryWorkshopCode);
WmsCarryH carry = await db.Queryable<WmsCarryH>().Where(x=>x.carry_code==input.carry_code).FirstAsync();
prdMaterialReceiptH = new PrdMaterialReceiptH()
{
code = code,
station_id = input.station_id,
mo_task_id = moTask.id,
process_id = moTask.process_id,
equip_id = moTask.eqp_id,
workshop_id = workshop?.Id ?? "",
carry_id = carry.id,
workline_id = workline?.Id ?? "",
carry_code = input.carry_code,
mbom_process_id = moTask.mbom_process_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = _userManager.GetUserInfo().Result.organizeId
};
if (input.details != null && input.details.Count > 0)
{
foreach (var item in input.details)
{
if (!inputMaterials.Contains(item.material_id) && !input.sure)
{
throw new Exception("存在不属于生产bom的投入物料，确认签收吗");
}
list.Add(new PrdMaterialReceiptD
{
material_receipt_id = prdMaterialReceiptH.id,
material_id = item.material_id,
num = item.codeqty,
batch = item.code_batch,
unit_id = item.unit_id,
carry_id = carry.id,
barcode = item.barcode,
is_all_feeding = 0,
member_carry_id = item.member_carryid,
member_carry_code = item.member_carrycode,
feeding_num = 0,
supplier_id = item.supplier_id,
instock_time = item.instock_time,
check_conclusion = item.check_conclusion,
});
}
}
else
{
throw new Exception("没有签收物料");
}
// await db.Insertable<PrdMaterialReceiptH>(prdMaterialReceiptH).ExecuteCommandAsync();
// await db.Insertable<PrdMaterialReceiptD>(list).ExecuteCommandAsync();
});
if (result.IsSuccess)
{
//签收后调用载具签收接口
// await _wmsSignForDeliveryService.MESCarrySign(new MESCarrySignInput()
// {
// org_id = _userManager.GetUserInfo().Result.organizeId,
// create_id = _userManager.UserId,
// carry_code = input.carry_code ?? "",
// });
MESCarrySignInput mesCarrySignInput = new()
{
org_id = _userManager.GetUserInfo().Result.organizeId,
create_id = _userManager.UserId,
carry_code = input.carry_code ?? "",
};
string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
Dictionary<string, object> header = new()
{
["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
};
string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CARRY_SIGN, JsonConvert.SerializeObject(mesCarrySignInput), header);
Log.Information(sendResult);
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(sendResult);
result2 = authResponse.code != 200
? throw Oops.Bah(authResponse.msg)
: await db.Ado.UseTranAsync(async () =>
{
_ = await db.Insertable<PrdMaterialReceiptH>(prdMaterialReceiptH).ExecuteCommandAsync();
_ = await db.Insertable<PrdMaterialReceiptD>(list).ExecuteCommandAsync();
});
}
if (result.ErrorMessage == "存在不属于生产bom的投入物料，确认签收吗")
{
return "存在不属于生产bom的投入物料，确认签收吗";
}
return !result.IsSuccess
? throw Oops.Bah(result.ErrorMessage)
: !result2.IsSuccess ? throw Oops.Bah(result2.ErrorMessage) : (dynamic)"签收成功";
}
}
}

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

@@ -735,7 +735,7 @@ namespace Tnb.ProductionMgr
batch = a.batch,
supplier_name = d.supplier_name,
check_conclusion = c.check_conclusion,
instock_time = c.instock_time.ToString(DbTimeFormat.SS),
instock_time = c.instock_time==null ? "" : c.instock_time.Value.ToString(DbTimeFormat.SS),
feeding_time = e.create_time == null ? "" : e.create_time.Value.ToString(DbTimeFormat.SS),
}).ToListAsync();
@@ -848,8 +848,8 @@ namespace Tnb.ProductionMgr
batch = a.batch,
supplier_name = d.supplier_name,
check_conclusion = c.check_conclusion,
instock_time = c.instock_time.ToString("yyyy-MM-dd HH:mm:ss"),
feeding_time = e.create_time == null ? "" : e.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
instock_time = c.instock_time==null ? "" : c.instock_time.Value.ToString(DbTimeFormat.SS),
feeding_time = e.create_time == null ? "" : e.create_time.Value.ToString(DbTimeFormat.SS),
});
if (lastPrdReportIds != null && lastPrdReportIds.Count > 0)

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

@@ -1114,6 +1114,11 @@ namespace Tnb.ProductionMgr
throw Oops.Bah("已开始的不能再开始");
}
if (await db.Queryable<PrdMoTask>().AnyAsync(x => x.workstation_id == item.workstation_id && x.mo_task_status == DictConst.InProgressEnCode && x.id != item.id))
{
throw Oops.Bah("该工位已有生产中的任务单");
}
if (item.mo_task_status is not DictConst.ToBeStartedEnCode and not DictConst.MoStatusPauseCode)
{
throw Oops.Bah("状态错误无法开始");
@@ -1444,6 +1449,7 @@ namespace Tnb.ProductionMgr
ISqlSugarClient db = _repository.AsSugarClient();
PrdMoTask? prdMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.mo_task_id);
EqpEquipment equip = await db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
BasMaterial basMaterial = await db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdMoTask.material_id);
PrdReport report = await db.Queryable<PrdReport>().FirstAsync(it => it.mo_task_id == input.mo_task_id);
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
@@ -1709,10 +1715,20 @@ namespace Tnb.ProductionMgr
if (result.IsSuccess)
{
if (equip.tube == "1")
if (!string.IsNullOrEmpty(basMaterial.category_id))
{
string resultMsg = await _prdInstockService.InstockTubeOne(report);
return resultMsg == "true" ? (dynamic)true : throw Oops.Bah(resultMsg);
string[] arr = JsonConvert.DeserializeObject<string[]>(basMaterial.category_id);
if (arr.Length > 0 && arr.Contains("DGJCJ"))//短管挤出件入库申请
{
string resultMsg = await _prdInstockService.InstockTubeOne(report);
return resultMsg == "true" ? (dynamic)true : throw Oops.Bah(resultMsg);
}
if (arr.Length > 0 && arr.Contains("CGJCJ"))//短管挤出件入库申请
{
string resultMsg = await _prdInstockService.InstockTubeThree(report);
return resultMsg == "true" ? (dynamic)true : throw Oops.Bah(resultMsg);
}
}
}
@@ -2659,6 +2675,7 @@ namespace Tnb.ProductionMgr
{
material_id = x.material_id,
material_code = y.code,
category_id = y.category_id,
num = x.num
})

126
ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
View File

@@ -42,13 +42,15 @@ namespace Tnb.ProductionMgr
private readonly IDictionaryDataService _dictionaryDataService;
private readonly IOrganizeService _organizeService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public PrdOutstockService(ISqlSugarRepository<PrdOutstockH> repository, IOrganizeService organizeService, IRunService runService, IUserManager userManager, IVisualDevService visualDevService, IDictionaryDataService dictionaryDataService)
public PrdOutstockService(ISqlSugarRepository<PrdOutstockH> repository, IOrganizeService organizeService, IBillRullService billRullService,IRunService runService, IUserManager userManager, IVisualDevService visualDevService, IDictionaryDataService dictionaryDataService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_billRullService = billRullService;
_dictionaryDataService = dictionaryDataService;
_repository = repository;
_userManager = userManager;
@@ -122,6 +124,7 @@ namespace Tnb.ProductionMgr
}
[HttpPost]
public async Task<dynamic> GeneralOutstock(GeneralOutstockInput generalOutstockInput)
{
try
@@ -194,12 +197,15 @@ namespace Tnb.ProductionMgr
{
PrdOutstockH prdOutstockH = new()
{
bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.PRDOUTSTOCK_CODE),
bill_type = DictConst.SHENGCHANLINGLIAO,
type = "1",
warehouse_id = warehouse_id,
location_code = generalOutstockInput.location_code,
create_id = _userManager.UserId,
org_id = _userManager.GetUserInfo().Result.organizeId,
bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
create_time = DateTime.Now,
workstation = generalOutstockInput.workstation_id,
workline = workline?.Id ?? ""
};
@@ -243,5 +249,123 @@ namespace Tnb.ProductionMgr
throw Oops.Bah(e.Message);
}
}
[HttpPost]
public async Task<dynamic> MaterialOutstock(MaterialOutstockInput materialOutstockInput)
{
try
{
var db = _repository.AsSugarClient();
string warehouse_id = "27209786980373";//长件挤出缓存仓
MESCreateOutstockInput input = new MESCreateOutstockInput();
input.outstock = new MESWmsOutstockHInput();
input.outstockDs = new List<MESWmsOutstockDInput>();
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x=>x.id==materialOutstockInput.mo_task_id);
BasLocation location = await db.Queryable<BasLocation>().Where(x=>x.location_code==materialOutstockInput.location_code).FirstAsync();
if (location == null) throw Oops.Bah("未找到库位");
string locationId = location.id;
input.outstock.bill_type = DictConst.SHENGCHANLINGLIAO;
// input.outstock.bill_date = visualDevModelDataCrInput.data.ContainsKey("bill_date") ? Convert.ToDateTime(visualDevModelDataCrInput.data["bill_date"].ToString()) : DateTime.Now;
input.outstock.bill_date = DateTime.Now;
input.outstock.org_id = _userManager.GetUserInfo().Result.organizeId;
input.outstock.warehouse_id = warehouse_id;
input.outstock.create_id = _userManager.UserId;
input.outstock.location_code = location?.location_code ?? "";
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(materialOutstockInput.workstation_id, DictConst.RegionCategoryWorklineCode);
List<string> materialIds = materialOutstockInput.details.Select(x => x.material_id).ToList();
List<BasMaterial> basMaterials = await db.Queryable<BasMaterial>().Where(x=>materialIds.Contains(x.id)).ToListAsync();
Dictionary<string,object> unitIdDic = await db.Queryable<BasMaterial>()
.LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit)
.LeftJoin<DictionaryDataEntity>((a, b, c) => b.Id == c.DictionaryTypeId && a.unit_id == c.EnCode)
.Where((a,b,c)=>materialIds.Contains(a.id))
.Select((a, b, c) => new
{
key = a.id,
value = c.Id
})
.ToDictionaryAsync(x => x.key, x => x.value);
foreach (var item in materialOutstockInput.details)
{
input.outstockDs.Add(new MESWmsOutstockDInput()
{
material_id = item.material_id,
material_code = basMaterials.First(x=>x.id==item.material_id).code,
pr_qty = item.num,
unit_id = unitIdDic[item.material_id].ToString()
});
}
string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
Dictionary<string, object> header = new Dictionary<string, object>()
{
["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
};
var sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_OUTSTOCK,JsonConvert.SerializeObject(input),header);
Log.Information(sendResult);
AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(sendResult);
if (authResponse.code != 200)
{
throw Oops.Bah(authResponse.msg);
}
else
{
PrdOutstockH prdOutstockH = new PrdOutstockH();
prdOutstockH.bill_code = await _billRullService.GetBillNumber(CodeTemplateConst.PRDOUTSTOCK_CODE);
prdOutstockH.bill_type = DictConst.SHENGCHANLINGLIAO;
prdOutstockH.type = "2";
prdOutstockH.warehouse_id = warehouse_id;
prdOutstockH.location_code = materialOutstockInput.location_code;
prdOutstockH.create_id = _userManager.UserId;
prdOutstockH.org_id = _userManager.GetUserInfo().Result.organizeId;
prdOutstockH.bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
prdOutstockH.create_time = DateTime.Now;
prdOutstockH.workstation = materialOutstockInput.workstation_id;
prdOutstockH.workline = workline?.Id ?? "";
List<PrdOutstockD> prdOutstockDs = new List<PrdOutstockD>();
foreach (var item in materialOutstockInput.details)
{
prdOutstockDs.Add(new PrdOutstockD()
{
material_id = item.material_id,
material_code = basMaterials.First(x=>x.id==item.material_id).code,
material_name = basMaterials.First(x=>x.id==item.material_id).name,
pr_qty = item.num,
unit_id = unitIdDic[item.material_id].ToString(),
outstock_id = prdOutstockH.id,
source_id = prdMoTask.mo_task_code
});
}
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
await _repository.InsertAsync(prdOutstockH);
if (prdOutstockDs.Count > 0)
{
await db.Insertable<PrdOutstockD>(prdOutstockDs).ExecuteCommandAsync();
}
});
if (!result.IsSuccess)
{
throw Oops.Bah(result.ErrorMessage);
}
}
return await Task.FromResult(true);
}
catch (Exception e)
{
Console.WriteLine(e);
Log.Error(e.Message);
throw Oops.Bah(e.Message);
}
}
}
}

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

@@ -461,12 +461,12 @@ namespace Tnb.ProductionMgr
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
plan_end_date = a.plan_end_date == null ? "" : a.plan_end_date.Value.ToString(DbTimeFormat.SS),
tube = f.tube,
minpacking = b.minpacking,
main_num = k.number_of_primary_unit,
deputy_num = k.number_of_auxiliary_unit,
third_equip_code = f.third_equip_code,
weight_name = l.label_name
third_equip_code = l.equip_code,
weight_name = l.label_name,
category_id = b.category_id
})
.MergeTable()
.OrderBy($"{input.sidx} {input.sort}")

42
ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
View File

@@ -2,6 +2,7 @@
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Tnb.Common.Redis;
using Tnb.ProductionMgr.Entities.Dto;
using Tnb.ProductionMgr.Entities.Enums;
using Tnb.ProductionMgr.Interfaces;
@@ -11,25 +12,24 @@ namespace Tnb.ProductionMgr
//redis定时获取数采数据
public class RedisBackGround : IHostedService, IDisposable
{
private readonly Timer? packtimer;
private readonly Timer? limittimer;
private readonly RedisCache _redisCache;
private Timer? ZSpacktimer;
private Timer? JCpacktimer;
private Timer? limittimer;
private readonly RedisData _redisData;
private readonly IPrdInstockService _prdInstockService;
public RedisBackGround(RedisCache redisCache, IPrdInstockService prdInstockService)
public RedisBackGround(RedisData redisData, IPrdInstockService prdInstockService)
{
_redisCache = redisCache;
_redisData = redisData;
_prdInstockService = prdInstockService;
}
//获取注塑装箱状态
private void GetZSPackStatus(object state)
{
// Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss}");
// Console.WriteLine($"获取注塑装箱状态");
string[] strs = new string[1] { "TY4C-ZHUSU1" };
string sign = "agvMode";
foreach (string s in strs)
{
Dictionary<string, string> dic = _redisCache.HGetAll(s).Result;
Dictionary<string, string> dic = _redisData.HGetAll(s).Result;
foreach (KeyValuePair<string, string> kv in dic)
{
if (!kv.Key.Contains(sign))
@@ -40,7 +40,7 @@ namespace Tnb.ProductionMgr
JObject? res = JsonConvert.DeserializeObject<JObject>(kv.Value);
if (res != null && res["Value"] != null)
{
if (int.Parse(res["Value"]!.ToString()) is not ((int)Eagvmode.无请求) or not ((int)Eagvmode.收到请求))
if (int.Parse(res["Value"]!.ToString()) is not ((int)Eagvmode.无请求) and not ((int)Eagvmode.收到请求))
{
InstockInput instockInput = new()
{
@@ -55,13 +55,11 @@ namespace Tnb.ProductionMgr
//获取挤出装箱状态
private void GetJCPackStatus(object state)
{
// Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss}");
// Console.WriteLine($"获取挤出装箱状态");
string[] strs = new string[1] { "TY4C-SHUSONG-JC" };
string sign = "AGVFullCall";
foreach (string s in strs)
{
Dictionary<string, string> dic = _redisCache.HGetAll(s).Result;
Dictionary<string, string> dic = _redisData.HGetAll(s).Result;
foreach (KeyValuePair<string, string> kv in dic)
{
if (!kv.Key.Contains(sign))
@@ -87,13 +85,17 @@ namespace Tnb.ProductionMgr
//获取限位状态
private void GetLimitStatus(object state)
{
// Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss}");
// Console.WriteLine($"获取限位状态");
/*
Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss}");
Console.WriteLine($"获取挤出装箱状态");
string data = _redisData.GetHash("TY4C-SHUSONG-JC", "AGVFullCall").Result;
Console.WriteLine(data);*/
/*
string[] strs = new string[1] { "TY4C-WAIBAO" };
string sign = "AGVCall";
foreach (string s in strs)
{
Dictionary<string, string> dic = _redisCache.HGetAll(s).Result;
Dictionary<string, string> dic = _redisData.HGetAll(s).Result;
foreach (KeyValuePair<string, string> kv in dic)
{
if (!kv.Key.Contains(sign))
@@ -110,17 +112,19 @@ namespace Tnb.ProductionMgr
}
}
}
}
}*/
}
public void Dispose()
{
packtimer?.Dispose();
ZSpacktimer?.Dispose();
JCpacktimer?.Dispose();
limittimer?.Dispose();
}
public Task StartAsync(CancellationToken cancellationToken)
{
// packtimer = new Timer(GetPackStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(2));
// limittimer = new Timer(GetLimitStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(2));
// ZSpacktimer = new Timer(GetZSPackStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(2));
// JCpacktimer = new Timer(GetJCPackStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(2));
// limittimer = new Timer(GetLimitStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(2));
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken)

30
ProductionMgr/Tnb.ProductionMgr/RedisDataService.cs
View File

@@ -5,6 +5,7 @@ using JNPF.FriendlyException;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Tnb.Common.Redis;
using Tnb.ProductionMgr.Interfaces;
namespace Tnb.ProductionMgr
@@ -16,11 +17,10 @@ namespace Tnb.ProductionMgr
[Route("api/[area]/[controller]/[action]")]
public class RedisDataService : IRedisDataService, IDynamicApiController, ITransient
{
private readonly RedisCache _redisCache;
public RedisDataService(RedisCache redisCache)
private readonly RedisData _redisData;
public RedisDataService(RedisData redisData)
{
_redisCache = redisCache;
_redisData = redisData;
}
/// <summary>
/// 根据机号获取重量
@@ -28,31 +28,13 @@ namespace Tnb.ProductionMgr
[HttpPost]
public async Task<dynamic> GetWeight(string device, string jihao)
{
bool flag = await _redisCache.HashExist(device, jihao);
bool flag = await _redisData.HashExist(device, jihao);
if (!flag)
{
throw Oops.Bah("没有找到" + device + "----" + jihao + "的数据");
}
string data = await _redisCache.GetHash(device, jihao);
string data = await _redisData.GetHash(device, jihao);
JObject? res = JsonConvert.DeserializeObject<JObject>(data);
/*
var dic =await _redisCache.HGetAll("TY4C-JICHU");
string a = "";
foreach (var kvp in dic)
{
a += kvp.Key + "&" + kvp.Value + "$";
}
string aa = "";
var ss= aa.Split('$', StringSplitOptions.RemoveEmptyEntries);
foreach (var s in ss)
{
var b = s.Split('&');
await _redisCache.HSet("TY4C-JICHU", b[0], b[1]);
}*/
decimal result = res != null && res["Value"] != null ? decimal.Parse(res["Value"]!.ToString()) : throw Oops.Bah("数据格式错误");
return result;
}

6
apihost/Tnb.API.Entry/Configurations/Cache.json
View File

@@ -5,5 +5,11 @@
"port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=7"
},
"Redis": {
"ip": "localhost",
"port": 6379,
"password": "05jWEoJa8v",
"RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0"
}
}

4
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -2,6 +2,7 @@
using JNPF.Common.Cache;
using JNPF.Common.Core.Handlers;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.SpecificationDocument;
using JNPF.TaskScheduler.Interfaces.TaskScheduler;
using JNPF.VisualDev;
@@ -11,6 +12,7 @@ using Senparc.CO2NET.RegisterServices;
using Senparc.Weixin;
using Senparc.Weixin.Entities;
using Senparc.Weixin.RegisterServices;
using Tnb.Common.Redis;
using Tnb.ProductionMgr;
using Tnb.WarehouseMgr;
@@ -46,7 +48,7 @@ public class Startup : AppStartup
services.AddMemoryCache(); // 使用本地缓存必须添加
services.AddConfigurableOptions<CacheOptions>();
services.AddSingleton( typeof(ISingleton), typeof(RedisData));
// 微信
services.AddSenparcGlobalServices(App.Configuration) // Senparc.CO2NET 全局注册
.AddSenparcWeixinServices(App.Configuration); // Senparc.Weixin 注册（如果使用Senparc.Weixin SDK则添加）

247
common/Tnb.Common/Redis/RedisData.cs Normal file
View File

@@ -0,0 +1,247 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CSRedis;
using JNPF;
using JNPF.Common.Cache;
using JNPF.DependencyInjection;
using Microsoft.Extensions.Options;
namespace Tnb.Common.Redis
{
public class RedisData : ISingleton
{
private static CSRedisClient _instance;
public RedisData()
{
RedisOptions _RedisOptions = App.GetConfig<RedisOptions>("Redis", true);
_instance = new CSRedis.CSRedisClient(string.Format(_RedisOptions.RedisConnectionString, _RedisOptions.ip, _RedisOptions.port, _RedisOptions.password));
}
/// <summary>
/// 用于在 key 存在时删除 key.
/// </summary>
/// <param name="key">键.</param>
public long Del(params string[] key)
{
return _instance.Del(key);
}
/// <summary>
/// 用于在 key 存在时删除 key.
/// </summary>
/// <param name="key">键.</param>
public Task<long> DelAsync(params string[] key)
{
return _instance.DelAsync(key);
}
/// <summary>
/// 用于在 key 模板存在时删除.
/// </summary>
/// <param name="pattern">key模板.</param>
public async Task<long> DelByPatternAsync(string pattern)
{
if (string.IsNullOrEmpty(pattern))
return default;
// pattern = Regex.Replace(pattern, @"\{.*\}", "*");
string[]? keys = await _instance.KeysAsync(pattern);
if (keys?.Length > 0)
{
return await _instance.DelAsync(keys);
}
return default;
}
/// <summary>
/// 检查给定 key 是否存在.
/// </summary>
/// <param name="key">键.</param>
public bool Exists(string key)
{
return _instance.Exists(key);
}
/// <summary>
/// 检查给定 key 是否存在.
/// </summary>
/// <param name="key">键.</param>
public Task<bool> ExistsAsync(string key)
{
return _instance.ExistsAsync(key);
}
/// <summary>
/// 获取指定 key 的增量值.
/// </summary>
/// <param name="key">键.</param>
/// <param name="incrBy">增量.</param>
/// <returns></returns>
public long Incrby(string key, long incrBy)
{
return _instance.IncrBy(key, incrBy);
}
/// <summary>
/// 获取指定 key 的增量值.
/// </summary>
/// <param name="key">键.</param>
/// <param name="incrBy">增量.</param>
/// <returns></returns>
public Task<long> IncrbyAsync(string key, long incrBy)
{
return _instance.IncrByAsync(key, incrBy);
}
/// <summary>
/// 获取指定 key 的值.
/// </summary>
/// <param name="key">键.</param>
public string Get(string key)
{
return _instance.Get(key);
}
/// <summary>
/// 获取指定 key 的值.
/// </summary>
/// <typeparam name="T">byte[] 或其他类型.</typeparam>
/// <param name="key">键.</param>
public T Get<T>(string key)
{
return _instance.Get<T>(key);
}
/// <summary>
/// 获取指定 key 的值.
/// </summary>
/// <param name="key">键.</param>
/// <returns></returns>
public Task<string> GetAsync(string key)
{
return _instance.GetAsync(key);
}
/// <summary>
/// 获取指定 key 的值.
/// </summary>
/// <typeparam name="T">byte[] 或其他类型.</typeparam>
/// <param name="key">键.</param>
public Task<T> GetAsync<T>(string key)
{
return _instance.GetAsync<T>(key);
}
/// <summary>
/// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
public bool Set(string key, object value)
{
return _instance.Set(key, value);
}
/// <summary>
/// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
/// <param name="expire">有效期.</param>
public bool Set(string key, object value, TimeSpan expire)
{
return _instance.Set(key, value, expire);
}
/// <summary>
/// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
public Task<bool> SetAsync(string key, object value)
{
return _instance.SetAsync(key, value);
}
/// <summary>
/// 保存.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
/// <param name="expire">过期时间.</param>
/// <returns></returns>
public Task<bool> SetAsync(string key, object value, TimeSpan expire)
{
return _instance.SetAsync(key, value, expire);
}
/// <summary>
/// 只有在 key 不存在时设置 key 的值.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
/// <param name="expire">有效期.</param>
public bool SetNx(string key, object value, TimeSpan expire)
{
if (_instance.SetNx(key, value))
{
_instance.Set(key, value, expire);
return true;
}
else
{
return false;
}
}
/// <summary>
/// 只有在 key 不存在时设置 key 的值.
/// </summary>
/// <param name="key">键.</param>
/// <param name="value">值.</param>
public bool SetNx(string key, object value)
{
return _instance.SetNx(key, value);
}
/// <summary>
/// 获取所有key.
/// </summary>
/// <returns></returns>
public List<string> GetAllKeys()
{
return _instance.Keys("*").ToList();
}
/// <summary>
/// 获取缓存过期时间.
/// </summary>
/// <param name="key">键值.</param>
/// <returns></returns>
public DateTime GetCacheOutTime(string key)
{
long second = _instance.PTtl(key);
return DateTime.Now.AddMilliseconds(second);
}
public Task<string> GetHash(string key, string field)
{
return _instance.HGetAsync(key, field);
}
public Task<bool> HashExist(string key, string field)
{
return _instance.HExistsAsync(key, field);
}
public Task<Dictionary<string, string>> HGetAll(string key)
{
return _instance.HGetAllAsync(key);
}
public Task<bool> HSet(string key, string field, string value)
{
return _instance.HSetAsync(key, field, value);
}
}
}

34
common/Tnb.Common/Redis/RedisOptions.cs Normal file
View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Cache;
using JNPF.ConfigurableOptions;
namespace Tnb.Common.Redis
{
public class RedisOptions : IConfigurableOptions
{
/// <summary>
/// Redis配置.
/// </summary>
public string RedisConnectionString { get; set; }
/// <summary>
/// 服务器地址.
/// </summary>
public string ip { get; set; }
/// <summary>
/// 端口.
/// </summary>
public int port { get; set; }
/// <summary>
/// 密码.
/// </summary>
public string password { get; set; }
}
}

2
visualdev/Tnb.Vengine/CodeGenerator/TemplateContext.cs
View File

@@ -28,7 +28,7 @@ public class TemplateContext
#if DEBUG
BasePath = CodeHelper.GetSolutionDirectoryPath(false)!;
#else
BasePath = FileVariable.GenerateCodePath;
BasePath = JNPF.Common.Configuration.FileVariable.GenerateCodePath;
#endif
ModuleCode = moduleCode;
}