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-29 18:10:22 +08:00
parent 6517149d58 c125e42ce7
commit 7bbddae5cb
11 changed files with 248 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicData/Tnb.BasicData.Interfaces/IThirdApiRecordService.cs
View File

@@ -11,6 +11,6 @@ namespace Tnb.BasicData.Interfaces
/// <param name="id"></param>
/// <param name="send_type">手动 自动</param>
/// <returns></returns>
Task<ThirdResult> Send(List<ThirdWebapiRecord> records, string send_type,ISqlSugarClient db=null);
Task<ThirdResult> Send(List<ThirdWebapiRecord> records, string send_type,ISqlSugarClient db=null,bool ThreadFlag = true);
}
}

24
BasicData/Tnb.BasicData/ThirdApiRecordService.cs
View File

@@ -44,7 +44,7 @@ namespace Tnb.BasicData
public async Task<string> Send(string id)
{
ThirdWebapiRecord record = await _repository.GetSingleAsync(x=>x.id==id);
ThirdResult thirdResult = await Send(Arrays.AsList(record), "手动");
ThirdResult thirdResult = await Send(Arrays.AsList(record), "手动",null,false);
return thirdResult.msgResult;
}
@@ -89,7 +89,25 @@ namespace Tnb.BasicData
return "失败";
}
public async Task<ThirdResult> Send(List<ThirdWebapiRecord> records, string send_type,ISqlSugarClient db=null)
public async Task<ThirdResult> Send(List<ThirdWebapiRecord> records, string send_type,ISqlSugarClient db=null,bool threadFlag=true)
{
ThirdResult thirdResult = new ThirdResult();
if (threadFlag)
{
Task.Run(() =>
{
Send(records, send_type, db);
});
}
else
{
thirdResult = await Send(records, send_type, db);
}
return thirdResult;
}
private async Task<ThirdResult> Send(List<ThirdWebapiRecord> records, string send_type, ISqlSugarClient db = null)
{
ThirdResult thirdResult = null;
bool tranFlag = true;
@@ -273,8 +291,6 @@ namespace Tnb.BasicData
Log.Error(e.Message,e);
if(tranFlag) await db.Ado.RollbackTranAsync();
}
return thirdResult;
}
}

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

@@ -0,0 +1,15 @@
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class PrdReportUserListOutput
{
public string id {get;set;}
public string mo_task_id {get;set;}
public string equip_id {get;set;}
public string material_id {get;set;}
public string batch {get;set;}
public decimal? reported_qty {get;set;}
public decimal? rqty {get;set;}
public string create_id {get;set;}
public string create_time {get;set;}
}
}

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

@@ -169,4 +169,14 @@ public partial class PrdReport : BaseEntity<string>
/// </summary>
public string erp_pk_wr_product { get; set; }
/// <summary>
/// 合格数
/// </summary>
public decimal? pqty { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal? rqty { get; set; }
}

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

@@ -1607,7 +1607,7 @@ namespace Tnb.ProductionMgr
//string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
string code1 = $"(01){basMaterial.di ?? ""}*(11){item.act_start_date.Value.ToString("yyMMdd")}*(17){item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}";
string code2 = $"{basMaterial.material_specification}*{batch}*{item.act_start_date.Value.ToString("yyyyMMdd")}*{item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
string code2 = $"{basMaterial.material_specification}*{batch}*{item.act_start_date.Value.ToString("yyyyMMdd")}*{item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}";
Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = "外包装箱码垛线",
@@ -2092,22 +2092,12 @@ namespace Tnb.ProductionMgr
}else if (mo.mo_type == DictConst.PrdMoTypeJC)
{
if (changeBatchFlag)
{
EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
batch = $"{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 2, 2)}{equipment.code.Substring(equipment.code.Length - 2, 2)}{prdMoTask.act_start_date.Value.ToString("yyMMdd")}";
await db.Updateable<PrdMoTask>()
.SetColumns(x => x.batch == batch)
.SetColumns(x=>x.change_batch_count_by_day==changeCountNumByDay)
.SetColumns(x=>x.change_batch_count_by_qty==changeCountNumByQty)
.Where(x => x.id == prdMoTask.id)
.ExecuteCommandAsync();
}
else
{
batch = prdMoTask.batch;
}
ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
batch = $"6{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 4, 2)}{DateTime.Now.ToString("yyMMdd")}";
await db.Updateable<PrdMoTask>()
.SetColumns(x => x.batch == batch)
.Where(x => x.id == prdMoTask.id)
.ExecuteCommandAsync();
}else
{
// OrganizeEntity organizeEntity = await _db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == prdMoTask.workline_id);
@@ -2496,6 +2486,12 @@ namespace Tnb.ProductionMgr
throw Oops.Bah(result1.msg);
}
await _db.Updateable<PrdReport>()
.SetColumns(x => x.pqty == input.pqty)
.SetColumns(x => x.rqty == input.rqty)
.Where(x => x.id == report.id)
.ExecuteCommandAsync();
WmsPrdInstockInput wmsPrdInstockInput = new WmsPrdInstockInput();
wmsPrdInstockInput.prd_bill_code = prdMo.mo_code;
wmsPrdInstockInput.material_id = prdMoTask.material_id;
@@ -2627,8 +2623,8 @@ namespace Tnb.ProductionMgr
// ["cbastunitid"] = 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 == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "",
["nbplanwrnum"] = report.reported_qty,
["nbwrnum"] = report.reported_qty,
["nbplanwrnum"] = input.pqty,
["nbwrnum"] = input.pqty,
["tbendtime"] = nowStr,
["tbstarttime"] = prdMoTask.act_start_date != null ? prdMoTask.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
["vbinbatchcode"] = report.batch,
@@ -2751,6 +2747,29 @@ namespace Tnb.ProductionMgr
}
[HttpPost]
public async Task<string> DelPrdReport(string id)
{
PrdReport prdReport = await _db.Queryable<PrdReport>().SingleAsync(x => x.id == id);
PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdReport.mo_task_id);
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
await _db.Updateable<PrdMoTask>()
.SetColumns(x => x.reported_work_qty == x.reported_work_qty - prdReport.reported_qty)
.Where(x => x.id == prdMoTask.id)
.ExecuteCommandAsync();
await _db.Updateable<PrdMo>()
.SetColumns(x => x.reported_work_qty == x.reported_work_qty - prdReport.reported_qty)
.Where(x => x.id == prdMoTask.mo_id)
.ExecuteCommandAsync();
await _db.Deleteable<PrdReport>().Where(x => x.id == id).ExecuteCommandAsync();
});
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "保存成功" : result.ErrorMessage);
}
/// <summary>
/// 自检报废提交
/// </summary>
@@ -4102,6 +4121,40 @@ namespace Tnb.ProductionMgr
.SetColumns(x => x.batch == batch)
.Where(x => idList.Contains(x.id))
.ExecuteCommandAsync();
foreach (var id in idList)
{
PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.id == id).SingleAsync();
if (prdMoTask.mo_task_status == DictConst.InProgressEnCode)
{
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().Where(x=>x.id==prdMoTask.material_id).SingleAsync();
string code1 = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}";
string code2 = $"{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}";
Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = "外包装箱码垛线",
["token"] = _eleCtlCfg.token,
["TagName"] = "WBZX_tb_cs",
["Value"] = code1,
};
Dictionary<string, string> dicCommand2 = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = "外包装箱码垛线",
["token"] = _eleCtlCfg.token,
["TagName"] = "WBZX_pm_cs",
["Value"] = code2,
};
Log.Information($"贴标写入参数:{JsonConvert.SerializeObject(dicCommand1)}");
string result1 = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand1, false);
Log.Information($"贴标写入返回结果:{JsonConvert.SerializeObject(result1)}");
Log.Information($"喷码写入参数:{JsonConvert.SerializeObject(dicCommand2)}");
string result2 = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand2, false);
Log.Information($"喷码写入返回结果:{JsonConvert.SerializeObject(result2)}");
}
}
return row>0 ? "设置成功" : "设置失败";
}

119
ProductionMgr/Tnb.ProductionMgr/PrdReportUserListService.cs Normal file
View File

@@ -0,0 +1,119 @@
using JNPF;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Extras.CollectiveOAuth.Utils;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Entities.Dto;
using Tnb.ProductionMgr.Entities.Dto.PrdManage;
using Tnb.ProductionMgr.Entities.Enums;
using Tnb.ProductionMgr.Interfaces;
using AuthResponse = JNPF.Extras.CollectiveOAuth.Models.AuthResponse;
using StringExtensions = JNPF.Common.Extension.StringExtensions;
namespace Tnb.ProductionMgr
{
/// <summary>
/// 人员产量统计表
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class PrdReportUserListService : IOverideVisualDevService, IDynamicApiController, ITransient
{
private const string ModuleId = "37231170320661";
private readonly ISqlSugarRepository<PrdMo> _repository;
private readonly IDataBaseManager _dataBaseManager;
private readonly IUserManager _userManager;
private readonly IDictionaryDataService _dictionaryDataService;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly ISqlSugarClient _db;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public PrdReportUserListService(
ISqlSugarRepository<PrdMo> repository,
IDataBaseManager dataBaseManager,
IUserManager userManager,
IDictionaryDataService dictionaryDataService,
IRunService runService,
IVisualDevService visualDevService
)
{
_repository = repository;
_dataBaseManager = dataBaseManager;
_userManager = userManager;
_dictionaryDataService = dictionaryDataService;
_runService = runService;
_visualDevService = visualDevService;
_db = _repository.AsSugarClient();
OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string moTaskCode = queryJson.ContainsKey("mo_task_id") ? queryJson["mo_task_id"].ToString() : "";
string equipInfo = queryJson.ContainsKey("equip_id") ? queryJson["equip_id"].ToString() : "";
string materialInfo = queryJson.ContainsKey("material_id") ? queryJson["material_id"].ToString() : "";
string createInfo = queryJson.ContainsKey("create_id") ? queryJson["create_id"].ToString() : "";
DateTime[] createTime = queryJson.ContainsKey("create_time") ? queryJson["create_time"].ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray() : null;
DateTime? sDate = null;
DateTime? eDate = null;
if (createTime != null && createTime.Length == 2)
{
sDate = createTime[0];
eDate = createTime[1];
}
SqlSugarPagedList<PrdReportUserListOutput> result = await db.Queryable<PrdReport>()
.LeftJoin<PrdMoTask>((a,b)=>a.mo_task_id==b.id)
.LeftJoin<BasMaterial>((a, b,c) => a.material_id == c.id)
.LeftJoin<UserEntity>((a, b,c,d) => a.create_id == d.Id)
.LeftJoin<EqpEquipment>((a, b,c,d,e) => a.equip_id == e.id)
.WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => b.mo_task_code.Contains(moTaskCode))
.WhereIF(!string.IsNullOrEmpty(equipInfo), (a, b, c, d,e) => e.code.Contains(equipInfo) || e.name.Contains(equipInfo))
.WhereIF(!string.IsNullOrEmpty(materialInfo), (a, b, c, d,e) => c.code.Contains(materialInfo) || c.name.Contains(materialInfo))
.WhereIF(!string.IsNullOrEmpty(createInfo), (a, b, c, d,e) => d.Account.Contains(createInfo) || d.RealName.Contains(createInfo))
.WhereIF(createTime!=null && createTime.Length==2,a=>a.create_time>=sDate && a.create_time<=eDate)
.OrderByDescending(a => a.create_time)
.Select((a, b, c, d, e) => new PrdReportUserListOutput
{
id = a.id,
mo_task_id = b.mo_task_code,
equip_id = e.name,
material_id = c.code+"/"+c.name,
batch = a.batch,
reported_qty = a.reported_qty,
rqty = a.rqty,
create_id = d.RealName,
create_time = a.create_time.ToString(DbTimeFormat.SS)
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<PrdReportUserListOutput>.SqlSugarPageResult(result);
}
}
}

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

@@ -727,7 +727,7 @@ namespace Tnb.ProductionMgr
if (records.IsEmpty()) return "";
await _thirdApiRecordService.Send(records, "自动");
await _thirdApiRecordService.Send(records, "自动",null,false);
return "true";
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseH.cs
View File

@@ -164,4 +164,9 @@ public partial class WmsPurchaseH : BaseEntity<string>, IPurchaseAndSaleAuitEnti
/// 制单方式(自制 同步)
/// </summary>
public string make_method { get; set; }
/// <summary>
/// erp流水号
/// </summary>
public string service_num { get; set; }
}

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

@@ -378,6 +378,7 @@ namespace Tnb.WarehouseMgr
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("approver", erpCreateId);
erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("cbiztype", wmsPurchaseH?.transaction_type ?? "");
erpRequestData.Add("bitinbill", false);
erpRequestData.Add("cgeneralhid", null);
erpRequestData.Add("corpoid", erpOrg.corpoid);
@@ -402,6 +403,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("vbillcode", instock.bill_code);
erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? "");
erpRequestData.Add("csourcebillhid", wmsPurchaseH?.erp_arriveorder_pk ?? "");
erpRequestData.Add("vdef3", wmsPurchaseH?.service_num ?? "");
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach (WmsInstockD item in allInstockDetails)

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

@@ -479,11 +479,7 @@ namespace Tnb.WarehouseMgr
BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);
if(callErp.value=="1")
{
Thread thread = new(() =>
{
_thirdApiRecordService.Send(new List<ThirdWebapiRecord> { thirdWebapiRecord }, "自动", _db);
});
thread.Start();
_thirdApiRecordService.Send(new List<ThirdWebapiRecord> { thirdWebapiRecord }, "自动", _db);
}
}

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

@@ -167,6 +167,7 @@ namespace Tnb.WarehouseMgr
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("approver", erpCreateId);
erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("cbiztype", wmsPurchaseH?.transaction_type ?? "");
erpRequestData.Add("bitinbill", false);
erpRequestData.Add("cgeneralhid", null);
erpRequestData.Add("corpoid", erpOrg.corpoid);
@@ -191,6 +192,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("vbillcode", wmsPurchaseH.bill_code);
erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? "");
erpRequestData.Add("csourcebillhid", wmsPurchaseH?.erp_arriveorder_pk ?? "");
erpRequestData.Add("vdef3", wmsPurchaseH?.service_num ?? "");
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach (WmsInstockD item in allInstockDetails)