wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
周科达
2024-09-04 17:31:22 +08:00
parent b07f20845d
commit a4345646ca
8 changed files with 367 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2559,7 +2559,7 @@ namespace Tnb.ProductionMgr
// thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/pwrnew/save"; // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/pwrnew/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
thirdWebapiRecord.create_time = DateTime.Now; thirdWebapiRecord.create_time = DateTime.Now;
thirdWebapiRecord.remark = $"载具编号:{report?.material_box_code ?? ""}";
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
} }

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

@@ -914,7 +914,7 @@ namespace Tnb.ProductionMgr
try try
{ {
string response2 = HttpUtils.RequestGet($"{config.value}/api/production/time-work/sync-material"); string response2 = HttpUtils.RequestGet($"{config.value}/api/production/time-work/sync-material",null,10*60*1000);
AuthResponse authResponse2 = JsonConvert.DeserializeObject<AuthResponse>(response2); AuthResponse authResponse2 = JsonConvert.DeserializeObject<AuthResponse>(response2);
result += ","+authResponse2.data.ToString(); result += ","+authResponse2.data.ToString();
} }
@@ -1014,10 +1014,10 @@ namespace Tnb.ProductionMgr
if (erpBdMaterial.CODE.StartsWith("0401")) if (erpBdMaterial.CODE.StartsWith("0401"))
{ {
string str = ""; string str = "";
if (erpBdMaterial.MATERIALSPEC.Contains("*")) if (erpBdMaterial.MATERIALSPEC!=null && erpBdMaterial.MATERIALSPEC.Contains("*"))
{ {
str = erpBdMaterial.MATERIALSPEC; str = erpBdMaterial.MATERIALSPEC;
}else if (erpBdMaterial.NAME.Contains("*")) }else if (erpBdMaterial.NAME!=null && erpBdMaterial.NAME.Contains("*"))
{ {
str = erpBdMaterial.NAME; str = erpBdMaterial.NAME;
} }
@@ -1030,7 +1030,7 @@ namespace Tnb.ProductionMgr
if (strArr.Length <= 2) if (strArr.Length <= 2)
{ {
categoryId = "[\"CGJCJ\"]"; categoryId = "[\"CGJCJ\"]";
}else if (decimal.Parse(strArr[2]) > 600) }else if (decimal.Parse(strArr[2]) > 500)
{ {
categoryId = "[\"CGJCJ\"]"; categoryId = "[\"CGJCJ\"]";
} }
@@ -1042,7 +1042,7 @@ namespace Tnb.ProductionMgr
} }
else else
{ {
categoryId = materialcategoryDic.ContainsKey(erpBdMaterial.DEFNAME) ? $"[\"{materialcategoryDic["erpBdMaterial.DEFNAME"]}\"]" : "[\"CGJCJ\"]"; categoryId = !string.IsNullOrEmpty(erpBdMaterial.DEFNAME) && materialcategoryDic.ContainsKey(erpBdMaterial.DEFNAME) ? $"[\"{materialcategoryDic[erpBdMaterial.DEFNAME]}\"]" : "";
} }
if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID)) if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID))
@@ -1103,6 +1103,7 @@ namespace Tnb.ProductionMgr
ErpExtendField extendField = erpExtendFields.Find(x => x.cmaterialoid == erpBdMaterial.ID); ErpExtendField extendField = erpExtendFields.Find(x => x.cmaterialoid == erpBdMaterial.ID);
string materialId = extendField?.table_id ?? ""; string materialId = extendField?.table_id ?? "";
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == materialId); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == materialId);
// if (extendField.erp_modify_time==null || erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time)
if (erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time) if (erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time)
{ {
string unitId = erpExtendFields.Find(x => x.cunitid == erpBdMaterial.PK_MEASDOC)?.table_id ?? ""; string unitId = erpExtendFields.Find(x => x.cunitid == erpBdMaterial.PK_MEASDOC)?.table_id ?? "";
@@ -1114,7 +1115,7 @@ namespace Tnb.ProductionMgr
int updateRow = await _db.Updateable<BasMaterial>() int updateRow = await _db.Updateable<BasMaterial>()
.SetColumns(x => x.name == erpBdMaterial.NAME) .SetColumns(x => x.name == erpBdMaterial.NAME)
.SetColumns(x => x.code == erpBdMaterial.CODE) .SetColumns(x => x.code == erpBdMaterial.CODE)
.SetColumns(x=>x.category_id == categoryId) .SetColumnsIF(!string.IsNullOrEmpty(categoryId),x=>x.category_id == categoryId)
.SetColumns(x => x.material_specification == erpBdMaterial.MATERIALSPEC) .SetColumns(x => x.material_specification == erpBdMaterial.MATERIALSPEC)
.SetColumns(x => x.material_standard == erpBdMaterial.MATERIALTYPE) .SetColumns(x => x.material_standard == erpBdMaterial.MATERIALTYPE)
.SetColumns(x => x.unit_id == unitId) .SetColumns(x => x.unit_id == unitId)
@@ -1183,7 +1184,7 @@ namespace Tnb.ProductionMgr
BasMaterial material = materials.Find(x => x.code==firstItemInList.MPRODID); BasMaterial material = materials.Find(x => x.code==firstItemInList.MPRODID);
if (material == null) continue; if (material == null) continue;
string unitId = unitDic2.ContainsKey(firstItemInList.UNIT) ? unitDic2[firstItemInList.UNIT].ToString() : ""; string unitId = unitDic2.ContainsKey(firstItemInList.UNIT) ? unitDic2[firstItemInList.UNIT].ToString() : "";
if (basEbomHs.All(x => x.material_id != material.id && x.version != firstItemInList.HVERSION)) if (basEbomHs.FindIndex(x => x.material_id == material.id && x.version == firstItemInList.HVERSION)==-1)
{ {
BasEbomH basEbomH = new BasEbomH() BasEbomH basEbomH = new BasEbomH()
{ {

2
QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
View File

@@ -18,6 +18,8 @@
public string mo_task_code { get; set; } public string mo_task_code { get; set; }
public string batch { get; set; } public string batch { get; set; }
public int? qty { get; set; } public int? qty { get; set; }
public int? rqty { get; set; }
public string bill_code { get; set; } public string bill_code { get; set; }
public string equip_name { get; set; } public string equip_name { get; set; }
/// <summary> /// <summary>

5
QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs
View File

@@ -48,6 +48,11 @@ namespace Tnb.QcMgr.Entities
/// 合格数 /// 合格数
/// </summary> /// </summary>
public int? qty { get; set; } public int? qty { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public int? rqty { get; set; }
/// <summary> /// <summary>
/// 状态 /// 状态

2
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -108,6 +108,7 @@ namespace Tnb.QcMgr
mo_task_code = a.mo_task_code, mo_task_code = a.mo_task_code,
batch = a.batch, batch = a.batch,
qty = a.qty, qty = a.qty,
rqty = a.rqty,
material_standard = b.material_standard, material_standard = b.material_standard,
material_specification = b.material_specification, material_specification = b.material_specification,
equip_name = h.name, equip_name = h.name,
@@ -344,6 +345,7 @@ namespace Tnb.QcMgr
} }
await db.Ado.BeginTranAsync(); await db.Ado.BeginTranAsync();
QcCheckExecH.qty = int.Parse(CheckTaskInput.checknum) - rqty; QcCheckExecH.qty = int.Parse(CheckTaskInput.checknum) - rqty;
QcCheckExecH.rqty = rqty;
_ = await db.Updateable(QcCheckExecH).ExecuteCommandAsync(); _ = await db.Updateable(QcCheckExecH).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckExecDdel).ExecuteCommandAsync(); _ = await db.Deleteable(QcCheckExecDdel).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckExecDinsert).ExecuteCommandAsync(); _ = await db.Insertable(QcCheckExecDinsert).ExecuteCommandAsync();

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

@@ -386,8 +386,8 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("billmaker", erpCreateId); erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("corpoid", erpOrg.corpoid); erpRequestData.Add("corpoid", erpOrg.corpoid);
erpRequestData.Add("corpvid", erpOrg.corpvid); erpRequestData.Add("corpvid", erpOrg.corpvid);
erpRequestData.Add("cprocalbodyoid", erpOrg.pk_org_v); erpRequestData.Add("cprocalbodyoid", erpOrg.pk_org);
erpRequestData.Add("cprocalbodyvid", erpOrg.pk_group); erpRequestData.Add("cprocalbodyvid", erpOrg.pk_org_v);
erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死 erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死
@@ -448,6 +448,7 @@ namespace Tnb.WarehouseMgr
// thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now; thirdWebapiRecord.create_time = DateTime.Now;
thirdWebapiRecord.remark = $"载具编号:{prdReport?.material_box_code ?? ""}";
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
} }

681
WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs
View File

@@ -1,340 +1,341 @@
// using System; using System;
// using System.Collections.Generic; using System.Collections.Generic;
// using System.Linq; using System.Linq;
// using System.Text; using System.Text;
// using System.Threading.Tasks; using System.Threading.Tasks;
// using Aop.Api.Domain; using Aop.Api.Domain;
// using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
// using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Dtos.VisualDev;
// using JNPF.Common.Enums; using JNPF.Common.Enums;
// using JNPF.Common.Security; using JNPF.Common.Security;
// using JNPF.FriendlyException; using JNPF.FriendlyException;
// using JNPF.Systems.Entitys.System; using JNPF.Systems.Entitys.System;
// using JNPF.Systems.Interfaces.System; using JNPF.Systems.Interfaces.System;
// using JNPF.VisualDev; using JNPF.VisualDev;
// using JNPF.VisualDev.Interfaces; using JNPF.VisualDev.Interfaces;
// using Mapster; using Mapster;
// using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
// using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
// using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
// using Newtonsoft.Json; using Newtonsoft.Json;
// using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
// using NPOI.HPSF; using NPOI.HPSF;
// using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen; using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
// using SqlSugar; using SqlSugar;
// using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
// using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
// using Tnb.WarehouseMgr.Entities.Attributes; using Tnb.WarehouseMgr.Entities.Attributes;
// using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
// using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
// using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
// using Tnb.WarehouseMgr.Entities.Entity; using Tnb.WarehouseMgr.Entities.Entity;
// using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
// using Tnb.ProductionMgr.Entities.Entity; using Tnb.ProductionMgr.Entities.Entity;
// using Tnb.BasicData; using Tnb.BasicData;
//
// namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
// { {
// /// <summary> /// <summary>
// /// 材料出库单 /// 材料出库单
// /// </summary> /// </summary>
// [OverideVisualDev(ModuleConsts.MODULE_WmsRawmatOutstock_ID)] [OverideVisualDev(ModuleConsts.MODULE_WmsRawmatOutstock_ID)]
// [ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
// public class WmsRawmatOutstockService : BaseWareHouseService public class WmsRawmatOutstockService : BaseWareHouseService
// { {
// private const string BizTypeId = WmsWareHouseConst.BIZTYPE_WmsRawmatOutstock_ID; private const string BizTypeId = WmsWareHouseConst.BIZTYPE_WmsRawmatOutstock_ID;
// private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
// private readonly IUserManager _userManager; private readonly IUserManager _userManager;
// private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
// private readonly IRunService _runService; private readonly IRunService _runService;
// private readonly IVisualDevService _visualDevService; private readonly IVisualDevService _visualDevService;
// private readonly IWmsPDAScanInStockService _wmsPDAScanInStock; private readonly IWmsPDAScanInStockService _wmsPDAScanInStock;
// private readonly IWareHouseService _wareHouseService; private readonly IWareHouseService _wareHouseService;
// public WmsRawmatOutstockService( public WmsRawmatOutstockService(
// ISqlSugarRepository<WmsCarryH> repository, ISqlSugarRepository<WmsCarryH> repository,
// IUserManager userManager, IUserManager userManager,
// IBillRullService billRullService, IBillRullService billRullService,
// IRunService runService, IRunService runService,
// IVisualDevService visualDevService, IVisualDevService visualDevService,
// IWmsPDAScanInStockService wmsPDAScanInStock, IWmsPDAScanInStockService wmsPDAScanInStock,
// IWareHouseService wareHouseService) IWareHouseService wareHouseService)
// { {
// _db = repository.AsSugarClient(); _db = repository.AsSugarClient();
// _userManager = userManager; _userManager = userManager;
// _billRullService = billRullService; _billRullService = billRullService;
// _runService = runService; _runService = runService;
// _visualDevService = visualDevService; _visualDevService = visualDevService;
// _wmsPDAScanInStock = wmsPDAScanInStock; _wmsPDAScanInStock = wmsPDAScanInStock;
// _wareHouseService = wareHouseService; _wareHouseService = wareHouseService;
//
// OverideFuncs.GetDetailsAsync = GetDetailsAsync; OverideFuncs.GetDetailsAsync = GetDetailsAsync;
// } }
//
//
// public override async Task ModifyAsync(WareHouseUpInput input) public override async Task ModifyAsync(WareHouseUpInput input)
// { {
// if (input == null) if (input == null)
// { {
// throw new ArgumentNullException(nameof(input)); throw new ArgumentNullException(nameof(input));
// } }
//
// WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().SingleAsync(x=>x.id==input.requireId); // WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().SingleAsync(x=>x.id==input.requireId);
// WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id); // WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id);
// List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>() // List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>()
// .Where(r => r.carry_id == input.wmsDistaskH.carry_id) // .Where(r => r.carry_id == input.wmsDistaskH.carry_id)
// .Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno) // .Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno)
// .ToListAsync(); // .ToListAsync();
// //
// decimal qty = wmsCarryCodes.Sum(r => r.codeqty); // decimal qty = wmsCarryCodes.Sum(r => r.codeqty);
// //
// List<String> unitCodes = wmsCarryCodes.Select(x => x.unit_id).Distinct().ToList(); // List<String> unitCodes = wmsCarryCodes.Select(x => x.unit_id).Distinct().ToList();
// List<string> materialIds = wmsCarryCodes.Select(x => x.material_id).ToList(); // List<string> materialIds = wmsCarryCodes.Select(x => x.material_id).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();
// //
// string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; // string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID;
// List<string> tableIds = new List<string>(); // List<string> tableIds = new List<string>();
// 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());
// //
// 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 userId = wmsRawmatTransferoutstockH.create_id; // string userId = wmsRawmatOutstockH.create_id;
// string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; // string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
// ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); // ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
// string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); // string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// List<WmsErpWarehouserelaH> wmsErpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync(); // List<WmsErpWarehouserelaH> wmsErpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync();
// //
// List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); // List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
// Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); // Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
// erpRequestData.Add("billmaker", erpCreateId); // erpRequestData.Add("billmaker", erpCreateId);
// erpRequestData.Add("ccostdomainoid", null); // erpRequestData.Add("ccostdomainoid", null);
// erpRequestData.Add("cdrawcalbodyoid", erpOrg.pk_org); // erpRequestData.Add("cdrawcalbodyoid", erpOrg.pk_org);
// erpRequestData.Add("cdrawcalbodyvid", erpOrg.pk_org_v); // erpRequestData.Add("cdrawcalbodyvid", erpOrg.pk_org_v);
// // erpRequestData.Add("cdrawwarehouseid", erpOrg.pk_org_v);
// erpRequestData.Add("corpoid", erpOrg.corpoid); //
// erpRequestData.Add("corpvid", erpOrg.corpvid); // erpRequestData.Add("corpoid", erpOrg.corpoid);
// erpRequestData.Add("cdptid","1001A1100000001JFOPQ");//部门先写死 // erpRequestData.Add("corpvid", erpOrg.corpvid);
// erpRequestData.Add("cdptvid","0001A1100000000AOMIQ");//部门先写死 // erpRequestData.Add("cdptid","1001A1100000001JFOPQ");//部门先写死
// erpRequestData.Add("cotherdptid","1001A1100000001JFOPQ");//部门先写死 // erpRequestData.Add("cdptvid","0001A1100000000AOMIQ");//部门先写死
// erpRequestData.Add("cotherdptvid","0001A1100000000AOMIQ");//部门先写死 // erpRequestData.Add("cotherdptid","1001A1100000001JFOPQ");//部门先写死
// erpRequestData.Add("creationtime", nowStr); // erpRequestData.Add("cotherdptvid","0001A1100000000AOMIQ");//部门先写死
// erpRequestData.Add("creator", erpCreateId); // erpRequestData.Add("creationtime", nowStr);
// erpRequestData.Add("ctrantypeid", "0001H11000000000D32A");//先写死 // erpRequestData.Add("creator", erpCreateId);
// erpRequestData.Add("cwarehouseid", outWhid);//先写死 // erpRequestData.Add("ctrantypeid", "0001H11000000000D32A");//先写死
// erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss")); // erpRequestData.Add("cwarehouseid", outWhid);//先写死
// erpRequestData.Add("dmakedate", nowStr); // erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
// erpRequestData.Add("dshldarrivedate", nowStr); // erpRequestData.Add("dmakedate", nowStr);
// erpRequestData.Add("dshlddiliverdate", nowStr); // erpRequestData.Add("dshldarrivedate", nowStr);
// erpRequestData.Add("fbillflag", 1); // erpRequestData.Add("dshlddiliverdate", nowStr);
// erpRequestData.Add("isbackdeliver", false); // erpRequestData.Add("fbillflag", 1);
// erpRequestData.Add("ntotalnum", qty); // erpRequestData.Add("isbackdeliver", false);
// erpRequestData.Add("pk_org", erpOrg.pk_org); // erpRequestData.Add("ntotalnum", qty);
// erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); // erpRequestData.Add("pk_org", erpOrg.pk_org);
// erpRequestData.Add("pk_group", erpOrg.pk_group); // erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
// erpRequestData.Add("vbillcode", wmsRawmatTransferoutstockH.bill_code); // erpRequestData.Add("pk_group", erpOrg.pk_group);
// erpRequestData.Add("vtrantypecode", "4Y-01");//先写死 // erpRequestData.Add("vbillcode", wmsRawmatTransferoutstockH.bill_code);
// // erpRequestData.Add("vtrantypecode", "4Y-01");//先写死
// List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); //
// foreach(var item in wmsCarryCodes) // List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
// { // foreach(var item in wmsCarryCodes)
// // 出库数量wmsMaterialSignD.sign_qty // {
// erpRequestDataDetails.Add(new Dictionary<string, object>() // // 出库数量wmsMaterialSignD.sign_qty
// { // erpRequestDataDetails.Add(new Dictionary<string, object>()
// ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", // {
// ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", // ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "",
// ["corpoid"] = erpOrg.corpoid, // ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "",
// ["corpvid"] = erpOrg.corpvid, // ["corpoid"] = erpOrg.corpoid,
// ["crowno"] = (wmsCarryCodes.FindIndex(x => x.id == item.id) + 1) * 10, // ["corpvid"] = erpOrg.corpvid,
// ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", // ["crowno"] = (wmsCarryCodes.FindIndex(x => x.id == item.id) + 1) * 10,
// ["nnum"] = item.codeqty, // ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
// ["nshouldnum"] = item.codeqty, // ["nnum"] = item.codeqty,
// ["pk_group"] = erpOrg.pk_group, // ["nshouldnum"] = item.codeqty,
// ["pk_org"] = erpOrg.pk_org, // ["pk_group"] = erpOrg.pk_group,
// ["pk_org_v"] = erpOrg.pk_org_v, // ["pk_org"] = erpOrg.pk_org,
// ["vbatchcode"] = item.code_batch, // ["pk_org_v"] = erpOrg.pk_org_v,
// // ["vbatchcode"] = item.code_batch,
// }); //
// } // });
// erpRequestData.Add("dtls", erpRequestDataDetails); // }
// requestData.Add(erpRequestData); // erpRequestData.Add("dtls", erpRequestDataDetails);
// BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); // requestData.Add(erpRequestData);
// ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); // BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
// thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); // ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
// thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; // thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
// thirdWebapiRecord.name = "材料出库单(自制)"; // thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
// thirdWebapiRecord.method = "POST"; // thirdWebapiRecord.name = "材料出库单(自制)";
// thirdWebapiRecord.url = config.value + "uapws/rest/materialOut/self/save"; // thirdWebapiRecord.method = "POST";
// // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; // thirdWebapiRecord.url = config.value + "uapws/rest/materialOut/self/save";
// thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); // // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save";
// thirdWebapiRecord.create_time = DateTime.Now; // thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
// await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); // thirdWebapiRecord.create_time = DateTime.Now;
// // await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
// }
// }
// [NonAction]
// private async Task<dynamic> GetDetailsAsync(string id) [NonAction]
// { private async Task<dynamic> GetDetailsAsync(string id)
// try {
// { try
// return await Task.FromResult(_db.Queryable<WmsRawmatOutstockD>().Where(r => r.bill_id == id).ToList()); {
// } return await Task.FromResult(_db.Queryable<WmsRawmatOutstockD>().Where(r => r.bill_id == id).ToList());
// catch (Exception ex) }
// { catch (Exception ex)
// return Task.FromResult(ex); {
// } return Task.FromResult(ex);
// } }
// }
// /// <summary>
// /// 下发 /// <summary>
// /// </summary> /// 下发
// /// <param name="input"></param> /// </summary>
// /// <returns></returns> /// <param name="input"></param>
// /// <exception cref="AppFriendlyException"></exception> /// <returns></returns>
// [HttpPost, NonUnify, AllowAnonymous] /// <exception cref="AppFriendlyException"></exception>
// public async Task<Entities.Dto.Outputs.Result> Distribute(RawmatOutstockInput input) [HttpPost, NonUnify, AllowAnonymous]
// { public async Task<Entities.Dto.Outputs.Result> Distribute(RawmatOutstockInput input)
// try {
// { try
// await _s_taskExecuteSemaphore_YCLOutstock.WaitAsync(); {
// if (string.IsNullOrEmpty(input.source_id)) await _s_taskExecuteSemaphore_YCLOutstock.WaitAsync();
// { if (string.IsNullOrEmpty(input.source_id))
// throw new AppFriendlyException("来源单据id不可为空", 500); {
// } throw new AppFriendlyException("来源单据id不可为空", 500);
// if (input.carrys.Count == 0) }
// { if (input.carrys.Count == 0)
// throw new AppFriendlyException("至少选择一个载具", 500); {
// } throw new AppFriendlyException("至少选择一个载具", 500);
// }
// WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().FirstAsync(it => it.id == input.source_id);
// WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().FirstAsync(it => it.id == wmsRawmatOutstockD.bill_id); WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().FirstAsync(it => it.id == input.source_id);
// WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().FirstAsync(it => it.id == wmsRawmatOutstockD.bill_id);
// List<WmsCarryH> _items = await _db.Queryable<WmsCarryH>().Where(r => input.carrys.Select(c => c.carry_code).Contains(r.carry_code)).ToListAsync();
// List<WmsCarryH> _items = await _db.Queryable<WmsCarryH>().Where(r => input.carrys.Select(c => c.carry_code).Contains(r.carry_code)).ToListAsync();
// List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => _items.Select(c => c.id).Contains(r.carry_id)
// && r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno).ToListAsync(); List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => _items.Select(c => c.id).Contains(r.carry_id)
// && r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno).ToListAsync();
// List<WmsCarryH> items = new List<WmsCarryH>();
// List<WmsCarryH> items = new List<WmsCarryH>();
// foreach (var carry in input.carrys.Select(c => c.carry_code))
// { foreach (var carry in input.carrys.Select(c => c.carry_code))
// items.Add(_items.Where(r => r.carry_code == carry).First()); {
// } items.Add(_items.Where(r => r.carry_code == carry).First());
// }
// foreach (var item in items)
// { foreach (var item in items)
// if (item.is_lock == 1) {
// { if (item.is_lock == 1)
// throw new AppFriendlyException($"载具{item.carry_code}已锁定", 500); {
// } throw new AppFriendlyException($"载具{item.carry_code}已锁定", 500);
// BasLocation carrryLoc = await _db.Queryable<BasLocation>().Where(r => r.id == item.location_id).FirstAsync(); }
// if (carrryLoc == null || carrryLoc.is_type != "0") BasLocation carrryLoc = await _db.Queryable<BasLocation>().Where(r => r.id == item.location_id).FirstAsync();
// { if (carrryLoc == null || carrryLoc.is_type != "0")
// throw new Exception($"托盘{item.carry_code}已经不在存储库位中，不能出库！"); {
// } throw new Exception($"托盘{item.carry_code}已经不在存储库位中，不能出库！");
// } }
// }
// decimal? sign_qty = 0;
// decimal? sign_qty = 0;
// decimal qty = wmsCarryCodes.Sum(c => c.codeqty);
// if (wmsRawmatOutstockD.actual_outstock_qty + qty > wmsRawmatOutstockD.qty) decimal qty = wmsCarryCodes.Sum(c => c.codeqty);
// { if (wmsRawmatOutstockD.actual_outstock_qty + qty > wmsRawmatOutstockD.qty)
// // 最后一个托盘的数量 {
// decimal lastCarryQty = wmsCarryCodes.Where(r => r.carry_id == items[items.Count - 1].id).Sum(r => r.codeqty); // 最后一个托盘的数量
// // 如果最后一个托盘数量小于超出的出库数量 decimal lastCarryQty = wmsCarryCodes.Where(r => r.carry_id == items[items.Count - 1].id).Sum(r => r.codeqty);
// if (lastCarryQty < wmsRawmatOutstockD.actual_outstock_qty + qty - wmsRawmatOutstockD.qty) // 如果最后一个托盘数量小于超出的出库数量
// { if (lastCarryQty < wmsRawmatOutstockD.actual_outstock_qty + qty - wmsRawmatOutstockD.qty)
// throw new AppFriendlyException($"本次出库数量{qty}已超过可出库数量{wmsRawmatOutstockD.qty - wmsRawmatOutstockD.actual_outstock_qty} 且无需选择{items[items.Count - 1].carry_code}", 500); {
// } throw new AppFriendlyException($"本次出库数量{qty}已超过可出库数量{wmsRawmatOutstockD.qty - wmsRawmatOutstockD.actual_outstock_qty} 且无需选择{items[items.Count - 1].carry_code}", 500);
// // 签收数量 }
// sign_qty = lastCarryQty - (wmsRawmatOutstockD.actual_outstock_qty + qty - wmsRawmatOutstockD.qty); // 签收数量
// } sign_qty = lastCarryQty - (wmsRawmatOutstockD.actual_outstock_qty + qty - wmsRawmatOutstockD.qty);
// }
// await _db.Ado.BeginTranAsync();
// await _db.Ado.BeginTranAsync();
// List<BasLocation> endLocations = new List<BasLocation>();
// List<BasLocation> endLocations = new List<BasLocation>();
// endLocations = _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1YCLDBOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0")
// .OrderBy("is_lock, task_nums, location_code").ToList(); endLocations = _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1YCLDBOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0")
// .OrderBy("is_lock, task_nums, location_code").ToList();
// if (endLocations.Count() < items.Count)
// { if (endLocations.Count() < items.Count)
// throw new AppFriendlyException($@"可用的终点库位数量为{endLocations.Count()}个 下发数量为{items.Count}个 请检查终点库位的锁定和占用状态", 500); {
// } throw new AppFriendlyException($@"可用的终点库位数量为{endLocations.Count()}个 下发数量为{items.Count}个 请检查终点库位的锁定和占用状态", 500);
// }
// foreach (var wmsCarryH in items)
// { foreach (var wmsCarryH in items)
// BasLocation startLocation = await _db.Queryable<BasLocation>().Where(r => r.id == wmsCarryH.location_id).FirstAsync(); {
// BasLocation startLocation = await _db.Queryable<BasLocation>().Where(r => r.id == wmsCarryH.location_id).FirstAsync();
// BasLocation endLocation = null;
// BasLocation endLocation = null;
// endLocation = await _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1YCLDBOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0").OrderBy("is_lock, task_nums, location_code").FirstAsync();
// endLocation = await _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1YCLDBOutstockLocation().Contains(r.id) && r.is_lock == 0 && r.is_use == "0").OrderBy("is_lock, task_nums, location_code").FirstAsync();
// if (endLocation == null)
// { if (endLocation == null)
// throw new AppFriendlyException($@"没有可用的终点库位！请检查终点库位的锁定和占用状态", 500); {
// } throw new AppFriendlyException($@"没有可用的终点库位！请检查终点库位的锁定和占用状态", 500);
// }
// WmsRawmatOutstockC wmsRawmatOutstockC = new WmsRawmatOutstockC();
// wmsRawmatOutstockC.bill_id = wmsRawmatOutstockH.id; WmsRawmatOutstockC wmsRawmatOutstockC = new WmsRawmatOutstockC();
// wmsRawmatOutstockC.mat_bill_id = wmsRawmatOutstockD.id; wmsRawmatOutstockC.bill_id = wmsRawmatOutstockH.id;
// wmsRawmatOutstockC.carry_id = wmsCarryH.id; wmsRawmatOutstockC.mat_bill_id = wmsRawmatOutstockD.id;
// wmsRawmatOutstockC.carry_code = wmsCarryH.carry_code; wmsRawmatOutstockC.carry_id = wmsCarryH.id;
// wmsRawmatOutstockC.create_id = input.create_id; wmsRawmatOutstockC.carry_code = wmsCarryH.carry_code;
// wmsRawmatOutstockC.create_time = DateTime.Now; wmsRawmatOutstockC.create_id = input.create_id;
// wmsRawmatOutstockC.startlocation_id = startLocation.id; wmsRawmatOutstockC.create_time = DateTime.Now;
// wmsRawmatOutstockC.startlocation_code = startLocation.location_code; wmsRawmatOutstockC.startlocation_id = startLocation.id;
// wmsRawmatOutstockC.endlocation_id = endLocation.id; wmsRawmatOutstockC.startlocation_code = startLocation.location_code;
// wmsRawmatOutstockC.endlocation_code = endLocation.location_code; wmsRawmatOutstockC.endlocation_id = endLocation.id;
// decimal carryQty = wmsCarryCodes.Where(r => r.carry_id == wmsCarryH.id).Sum(r => r.codeqty); wmsRawmatOutstockC.endlocation_code = endLocation.location_code;
// wmsRawmatOutstockC.qty = carryQty; decimal carryQty = wmsCarryCodes.Where(r => r.carry_id == wmsCarryH.id).Sum(r => r.codeqty);
// wmsRawmatOutstockC.sign_qty = wmsCarryH.id == items[items.Count - 1].id && sign_qty > 0 ? sign_qty : carryQty; wmsRawmatOutstockC.qty = carryQty;
// wmsRawmatOutstockC.sign_qty = wmsCarryH.id == items[items.Count - 1].id && sign_qty > 0 ? sign_qty : carryQty;
// await _db.Insertable(wmsRawmatOutstockC).ExecuteCommandAsync();
// await _db.Insertable(wmsRawmatOutstockC).ExecuteCommandAsync();
// CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput();
// commonCreatePretaskInput.startlocation_id = startLocation.id; CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput();
// commonCreatePretaskInput.endlocation_id = endLocation.id; commonCreatePretaskInput.startlocation_id = startLocation.id;
// commonCreatePretaskInput.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID; commonCreatePretaskInput.endlocation_id = endLocation.id;
// commonCreatePretaskInput.biz_type = WmsWareHouseConst.BIZTYPE_WmsRawmatOutstock_ID; commonCreatePretaskInput.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID;
// commonCreatePretaskInput.source_id = input.source_id; commonCreatePretaskInput.biz_type = WmsWareHouseConst.BIZTYPE_WmsRawmatOutstock_ID;
// commonCreatePretaskInput.carry_id = wmsCarryH.id; commonCreatePretaskInput.source_id = input.source_id;
// commonCreatePretaskInput.carry_code = wmsCarryH.carry_code; commonCreatePretaskInput.carry_id = wmsCarryH.id;
// commonCreatePretaskInput.isExcuteMission = false; commonCreatePretaskInput.carry_code = wmsCarryH.carry_code;
// commonCreatePretaskInput.isExcuteMission = false;
// Entities.Dto.Outputs.Result res = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput, _db);
// Entities.Dto.Outputs.Result res = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput, _db);
// if (res.code != HttpStatusCode.OK)
// { if (res.code != HttpStatusCode.OK)
// Logger.LogInformation($@"生成预任务失败"); {
// throw new AppFriendlyException($@"生成预任务失败", 500); Logger.LogInformation($@"生成预任务失败");
// } throw new AppFriendlyException($@"生成预任务失败", 500);
// } }
// }
// // 更新子表已下发数量
// await _db.Updateable<WmsRawmatOutstockD>().SetColumns(r => r.actual_outstock_qty == r.actual_outstock_qty + qty).Where(r => r.id == input.source_id).ExecuteCommandAsync(); // 更新子表已下发数量
// await _db.Updateable<WmsRawmatOutstockD>().SetColumns(r => r.actual_outstock_qty == r.actual_outstock_qty + qty).Where(r => r.id == input.source_id).ExecuteCommandAsync();
// await _db.Ado.CommitTranAsync();
// } await _db.Ado.CommitTranAsync();
// catch (Exception ex) }
// { catch (Exception ex)
// await _db.Ado.RollbackTranAsync(); {
// Logger.LogError("【Distribute】" + ex.Message); await _db.Ado.RollbackTranAsync();
// Logger.LogError("【Distribute】" + ex.StackTrace); Logger.LogError("【Distribute】" + ex.Message);
// return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message); Logger.LogError("【Distribute】" + ex.StackTrace);
// } return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
// finally }
// { finally
// _ = _s_taskExecuteSemaphore_YCLOutstock.Release(); {
// InvokeGenPretaskExcute(); _ = _s_taskExecuteSemaphore_YCLOutstock.Release();
// } InvokeGenPretaskExcute();
// }
// return await ToApiResult(HttpStatusCode.OK, "成功");
// } return await ToApiResult(HttpStatusCode.OK, "成功");
// }
// }
// } }
}

6
common/Tnb.CollectiveOAuth/Utils/HttpUtils.cs
View File

@@ -155,11 +155,15 @@ public class HttpUtils
/// </summary> /// </summary>
/// <param name="url">地址.</param> /// <param name="url">地址.</param>
/// <param name="header">请求参数定义.</param> /// <param name="header">请求参数定义.</param>
public static string RequestGet(string url, Dictionary<string, object> header = null) public static string RequestGet(string url, Dictionary<string, object> header = null, int? timeout = null)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(url); builder.Append(url);
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(builder.ToString()); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(builder.ToString());
if (timeout != null)
{
request.Timeout = timeout.Value;
}
request.ContentType = "application/json;charset=utf-8;"; request.ContentType = "application/json;charset=utf-8;";
ComeSetRequestHeader(request, header); ComeSetRequestHeader(request, header);
return ComeRequestGet(request); return ComeRequestGet(request);