8线入中储仓接口
This commit is contained in:
@@ -470,6 +470,10 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public const string ZZCSSX111012 = "32609251845653";
|
public const string ZZCSSX111012 = "32609251845653";
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 一楼中储仓入库工位
|
||||||
|
/// </summary>
|
||||||
|
public const string ZZCSSX011008 = "32609223625237";
|
||||||
|
/// <summary>
|
||||||
/// 料箱id
|
/// 料箱id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string LIAOXIANGID = "26037262680357";
|
public const string LIAOXIANGID = "26037262680357";
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
namespace Tnb.WarehouseMgr.Entities.Dto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 库房业务更新输入参数
|
||||||
|
/// </summary>
|
||||||
|
public class MaterialTransferDistributeYCL2ZCCInput
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 组织ID
|
||||||
|
/// </summary>
|
||||||
|
public string org_id { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 创建用户
|
||||||
|
/// </summary>
|
||||||
|
public string create_id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 来源单据id
|
||||||
|
/// </summary>
|
||||||
|
public string? source_id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 载具
|
||||||
|
/// </summary>
|
||||||
|
public List<MaterialTransferDistributeYCL2ZCCDetailInput>? details { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class MaterialTransferDistributeYCL2ZCCDetailInput
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 载具编码
|
||||||
|
/// </summary>
|
||||||
|
public string? carry_code { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal qty { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -80,6 +80,15 @@ public partial class WmsMaterialTransferD : BaseEntity<string>
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal? yzqty { get; set; }
|
public decimal? yzqty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 已下发数量(入库)
|
||||||
|
/// </summary>
|
||||||
|
public decimal? yxfqty_rk { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 已转数量(入库)
|
||||||
|
/// </summary>
|
||||||
|
public decimal? yzqty_rk { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 主表ID
|
/// 主表ID
|
||||||
|
|||||||
@@ -2296,7 +2296,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
};
|
};
|
||||||
string endLocId = multiList[i].endlocation_id;
|
string endLocId = multiList[i].endlocation_id;
|
||||||
|
|
||||||
WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().Where(r => r.id == carry.id).FirstAsync();
|
WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().Where(r => r.id == carry.id).FirstAsync();
|
||||||
// 同步料架下的载具位置
|
// 同步料架下的载具位置
|
||||||
if (wmsCarryH != null && wmsCarryH.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
|
if (wmsCarryH != null && wmsCarryH.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
|
||||||
{
|
{
|
||||||
@@ -3119,7 +3119,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
List<WmsCarryD> wmsCarryCodes = _db.Queryable<WmsCarryD>().Where(r => r.carry_id == rackid).ToList();
|
List<WmsCarryD> wmsCarryCodes = _db.Queryable<WmsCarryD>().Where(r => r.carry_id == rackid).ToList();
|
||||||
|
|
||||||
int move_num = 6;
|
int move_num = 6;
|
||||||
string[] startlocations = new string[2] { WmsWareHouseConst.ZZCSSX111011, WmsWareHouseConst.ZZCSSX111012 };
|
string[] startlocations = new string[2] { WmsWareHouseConst.ZZCSSX111011, WmsWareHouseConst.ZZCSSX111012 };
|
||||||
BasLocation startLocation = null;
|
BasLocation startLocation = null;
|
||||||
@@ -3139,7 +3139,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 每6个重新获取一次起点
|
// 每6个重新获取一次起点
|
||||||
if (index % move_num == 0)
|
if (index % move_num == 0)
|
||||||
{
|
{
|
||||||
startLocation = await _db.Queryable<BasLocation>().Where(r => startlocations.Contains(r.id)).OrderBy("is_lock, task_nums, location_code").FirstAsync();
|
startLocation = await _db.Queryable<BasLocation>().Where(r => startlocations.Contains(r.id)).OrderBy("is_lock, task_nums, location_code").FirstAsync();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
private readonly IWmsCarryQueryService _wmsCarryQueryService;
|
private readonly IWmsCarryQueryService _wmsCarryQueryService;
|
||||||
|
|
||||||
public static SemaphoreSlim s_taskDistributeToZCC = new(1);
|
public static SemaphoreSlim s_taskDistributeToZCC = new(1);
|
||||||
|
public static SemaphoreSlim s_taskDistributeYCL2ZCC = new(1);
|
||||||
|
|
||||||
public WmsMaterialTransferService(
|
public WmsMaterialTransferService(
|
||||||
ISqlSugarRepository<WmsCarryH> repository,
|
ISqlSugarRepository<WmsCarryH> repository,
|
||||||
@@ -292,7 +293,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 按托下发
|
/// 按托下发(到集中供料或外协)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="input"></param>
|
/// <param name="input"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
@@ -322,12 +323,12 @@ namespace Tnb.WarehouseMgr
|
|||||||
WmsMaterialTransferD wmsMaterialTransferD = await _db.Queryable<WmsMaterialTransferD>().FirstAsync(it => it.id == input.source_id);
|
WmsMaterialTransferD wmsMaterialTransferD = await _db.Queryable<WmsMaterialTransferD>().FirstAsync(it => it.id == input.source_id);
|
||||||
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().FirstAsync(it => it.id == wmsMaterialTransferD.bill_id);
|
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().FirstAsync(it => it.id == wmsMaterialTransferD.bill_id);
|
||||||
|
|
||||||
if (wmsMaterialTransferD.yxfqty == wmsMaterialTransferD.qty)
|
await s_taskExecuteSemaphore.WaitAsync();
|
||||||
|
if (wmsMaterialTransferD.yxfqty >= wmsMaterialTransferD.qty)
|
||||||
{
|
{
|
||||||
throw new AppFriendlyException("已下发数量已达到转库数量", 500);
|
throw new AppFriendlyException("已下发数量已达到转库数量", 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
await s_taskExecuteSemaphore.WaitAsync();
|
|
||||||
await _db.Ado.BeginTranAsync();
|
await _db.Ado.BeginTranAsync();
|
||||||
|
|
||||||
//入库取终点 //出库起点
|
//入库取终点 //出库起点
|
||||||
@@ -432,6 +433,120 @@ namespace Tnb.WarehouseMgr
|
|||||||
return await ToApiResult(HttpStatusCode.OK, "成功");
|
return await ToApiResult(HttpStatusCode.OK, "成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// PDA操作(8线到中储仓)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="input"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost, NonUnify, AllowAnonymous]
|
||||||
|
public async Task<Entities.Dto.Outputs.Result> DistributeYCL2ZCC(MaterialTransferDistributeYCL2ZCCInput input)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(input.source_id))
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException("来源单据id不可为空", 500);
|
||||||
|
}
|
||||||
|
if (input.details.Count == 0)
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException("请先扫描料箱", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
input.details.ForEach(r =>
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(r.carry_code))
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException($"料箱编码不能为空", 500);
|
||||||
|
}
|
||||||
|
if (r.qty <= 0)
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException($"料箱{r.carry_code}的数量必须大于0", 500);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await s_taskDistributeYCL2ZCC.WaitAsync();
|
||||||
|
WmsMaterialTransferD wmsMaterialTransferD = await _db.Queryable<WmsMaterialTransferD>().FirstAsync(it => it.id == input.source_id);
|
||||||
|
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().FirstAsync(it => it.id == wmsMaterialTransferD.bill_id);
|
||||||
|
|
||||||
|
if (wmsMaterialTransferD.yxfqty_rk >= wmsMaterialTransferD.qty)
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException("已下发数量已达到转库数量", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
decimal qty = input.details.Sum(r => r.qty);
|
||||||
|
if (qty > wmsMaterialTransferD.qty - wmsMaterialTransferD.yxfqty_rk)
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException($"下发数量{qty}已超过可下发数量{wmsMaterialTransferD.qty - wmsMaterialTransferD.yxfqty_rk}", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
await _db.Ado.BeginTranAsync();
|
||||||
|
//入库取终点 //出库起点
|
||||||
|
InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_ZC_ID, Size = input.details.Count };
|
||||||
|
List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
|
||||||
|
if (endLocations.Count == 0)
|
||||||
|
{
|
||||||
|
Logger.LogWarning("没有可用的入库库位");
|
||||||
|
throw new AppFriendlyException("没有可用的入库库位", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input.details.Count > endLocations.Count)
|
||||||
|
{
|
||||||
|
throw new AppFriendlyException("可用的入库库位数量少于扫描的料箱数量", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
|
List<WmsCarryH> wmsCarryHs = await _db.Queryable<WmsCarryH>().Where(r => input.details.Select(x => x.carry_code).Contains(r.carry_code)).ToListAsync();
|
||||||
|
|
||||||
|
foreach (var wmsCarryH in input.details)
|
||||||
|
{
|
||||||
|
BasLocation startLocation = await _db.Queryable<BasLocation>().Where(r => r.id == WmsWareHouseConst.ZZCSSX011008).FirstAsync();
|
||||||
|
|
||||||
|
BasLocation endLocation = endLocations[index];
|
||||||
|
|
||||||
|
CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput();
|
||||||
|
commonCreatePretaskInput.startlocation_id = startLocation.id;
|
||||||
|
commonCreatePretaskInput.endlocation_id = endLocation.id;
|
||||||
|
commonCreatePretaskInput.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
|
||||||
|
commonCreatePretaskInput.biz_type = WmsWareHouseConst.BIZTYPE_WMSMATERIALTRANSFER_ID;
|
||||||
|
commonCreatePretaskInput.source_id = input.source_id;
|
||||||
|
commonCreatePretaskInput.carry_id = wmsCarryHs[index].id;
|
||||||
|
commonCreatePretaskInput.carry_code = wmsCarryHs[index].carry_code;
|
||||||
|
commonCreatePretaskInput.isExcuteMission = false;
|
||||||
|
|
||||||
|
Entities.Dto.Outputs.Result res = await _wareHouseService.CommonCreatePretask(commonCreatePretaskInput, _db);
|
||||||
|
|
||||||
|
if (res.code != HttpStatusCode.OK)
|
||||||
|
{
|
||||||
|
Logger.LogInformation($@"生成预任务失败");
|
||||||
|
throw new AppFriendlyException($@"生成预任务失败", 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新子表已下发数量
|
||||||
|
await _db.Updateable<WmsMaterialTransferD>().SetColumns(r => r.yxfqty_rk == r.yxfqty_rk + qty).Where(r => r.id == input.source_id).ExecuteCommandAsync();
|
||||||
|
|
||||||
|
await _db.Ado.CommitTranAsync();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await _db.Ado.RollbackTranAsync();
|
||||||
|
Logger.LogError("【Distribute】" + ex.Message);
|
||||||
|
Logger.LogError("【Distribute】" + ex.StackTrace);
|
||||||
|
return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_ = s_taskDistributeYCL2ZCC.Release();
|
||||||
|
InvokeGenPretaskExcute();
|
||||||
|
}
|
||||||
|
|
||||||
|
return await ToApiResult(HttpStatusCode.OK, "成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 按料架下发(缓存仓)
|
/// 按料架下发(缓存仓)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -770,7 +885,6 @@ namespace Tnb.WarehouseMgr
|
|||||||
return await ToApiResult(HttpStatusCode.OK, "成功");
|
return await ToApiResult(HttpStatusCode.OK, "成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public override async Task ModifyAsync(WareHouseUpInput input)
|
public override async Task ModifyAsync(WareHouseUpInput input)
|
||||||
{
|
{
|
||||||
if (input == null)
|
if (input == null)
|
||||||
@@ -788,10 +902,21 @@ namespace Tnb.WarehouseMgr
|
|||||||
}
|
}
|
||||||
await _db.Ado.BeginTranAsync();
|
await _db.Ado.BeginTranAsync();
|
||||||
|
|
||||||
// 更新已转数量
|
bool isOk = false;
|
||||||
bool isOk = await _db.Updateable<WmsMaterialTransferD>().SetColumns(it => new WmsMaterialTransferD { yzqty = it.yzqty + wmsCarryCodes.Sum(r => r.codeqty) })
|
// 入库回写入库数量字段
|
||||||
.Where(it => it.id == input.source_id).ExecuteCommandHasChangeAsync();
|
if (input.wmsDistaskH.task_type == WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID)
|
||||||
|
{
|
||||||
|
// 更新已转数量(入库)
|
||||||
|
isOk = await _db.Updateable<WmsMaterialTransferD>().SetColumns(it => new WmsMaterialTransferD { yzqty_rk = it.yzqty_rk + wmsCarryCodes.Sum(r => r.codeqty) })
|
||||||
|
.Where(it => it.id == input.source_id).ExecuteCommandHasChangeAsync();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 更新已转数量
|
||||||
|
isOk = await _db.Updateable<WmsMaterialTransferD>().SetColumns(it => new WmsMaterialTransferD { yzqty = it.yzqty + wmsCarryCodes.Sum(r => r.codeqty) })
|
||||||
|
.Where(it => it.id == input.source_id).ExecuteCommandHasChangeAsync();
|
||||||
|
}
|
||||||
|
|
||||||
// 如果所有明细已完成 更新主表状态为完成
|
// 如果所有明细已完成 更新主表状态为完成
|
||||||
WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable<WmsMaterialTransferD>().Where(r => r.id == input.source_id).SingleAsync();
|
WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable<WmsMaterialTransferD>().Where(r => r.id == input.source_id).SingleAsync();
|
||||||
List<WmsMaterialTransferD> wmsMaterialTransferDs = _db.Queryable<WmsMaterialTransferD>()
|
List<WmsMaterialTransferD> wmsMaterialTransferDs = _db.Queryable<WmsMaterialTransferD>()
|
||||||
@@ -814,87 +939,96 @@ namespace Tnb.WarehouseMgr
|
|||||||
if (input.area_code == "E")
|
if (input.area_code == "E")
|
||||||
await sign(input);
|
await sign(input);
|
||||||
|
|
||||||
|
// 其它入库
|
||||||
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id);
|
if (input.wmsDistaskH.task_type == WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID)
|
||||||
List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x=>x.id).ToListAsync();
|
|
||||||
DictionaryDataEntity unitData = await _db.Queryable<DictionaryTypeEntity>()
|
|
||||||
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
|
|
||||||
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id)
|
|
||||||
.Select((x,y)=>y)
|
|
||||||
.FirstAsync();
|
|
||||||
List<string> ids = new List<string>();
|
|
||||||
ids.Add(wmsMaterialTransfer.create_id);
|
|
||||||
ids.Add(WmsWareHouseConst.AdministratorOrgId);
|
|
||||||
ids.Add(wmsMaterialTransfer.warehouse_outstock);
|
|
||||||
ids.Add(wmsMaterialTransfer.warehouse_instock);
|
|
||||||
ids.Add(wmsMaterialTransferd.material_id);
|
|
||||||
if (unitData != null)
|
|
||||||
{
|
{
|
||||||
ids.Add(unitData.Id);
|
|
||||||
}
|
}
|
||||||
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
|
// 其它出库
|
||||||
|
|
||||||
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
|
|
||||||
string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? "";
|
|
||||||
|
|
||||||
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
|
|
||||||
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
|
|
||||||
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
|
||||||
erpRequestData.Add("billmaker",erpCreateId);
|
|
||||||
erpRequestData.Add("cdptid","1001A1100000000JRLI1");// 先写死
|
|
||||||
erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死
|
|
||||||
erpRequestData.Add("corpoid",erpOrg.corpoid);
|
|
||||||
erpRequestData.Add("corpvid",erpOrg.corpoid);
|
|
||||||
erpRequestData.Add("cothercalbodyoid",erpOrg.pk_org);
|
|
||||||
erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
|
|
||||||
erpRequestData.Add("creationtime",nowStr);
|
|
||||||
erpRequestData.Add("creator",erpCreateId);
|
|
||||||
erpRequestData.Add("ctrantypeid","0001H11000000000D31W");
|
|
||||||
erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "");
|
|
||||||
erpRequestData.Add("dbilldate",nowStr);
|
|
||||||
erpRequestData.Add("dmakedate",nowStr);
|
|
||||||
erpRequestData.Add("ntotalnum",wmsCarryCodes.Sum(r => r.codeqty));
|
|
||||||
erpRequestData.Add("pk_group",erpOrg.pk_group);
|
|
||||||
erpRequestData.Add("pk_org",erpOrg.pk_org);
|
|
||||||
erpRequestData.Add("pk_org_v",erpOrg.pk_org_v);
|
|
||||||
erpRequestData.Add("vbillcode",wmsMaterialTransfer.bill_code);
|
|
||||||
erpRequestData.Add("vtrantypecode","4I-01");//其他出库 先写死
|
|
||||||
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
|
|
||||||
erpRequestDataDetails.Add(new Dictionary<string, object>()
|
|
||||||
{
|
{
|
||||||
["cbodytranstypecode"] = "4I-01",
|
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id);
|
||||||
["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "",
|
List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();
|
||||||
["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialoid ?? "",
|
DictionaryDataEntity unitData = await _db.Queryable<DictionaryTypeEntity>()
|
||||||
["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransferd.material_id)?.cmaterialvid ?? "",
|
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
|
||||||
["corpoid"] = erpOrg.corpoid,
|
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id)
|
||||||
["corpvid"] = erpOrg.corpvid,
|
.Select((x, y) => y)
|
||||||
["crowno"] = wmsMaterialTransferd.lineno,
|
.FirstAsync();
|
||||||
["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk,
|
List<string> ids = new List<string>();
|
||||||
["csourcebillhid"] = wmsMaterialTransfer.erp_pk,
|
ids.Add(wmsMaterialTransfer.create_id);
|
||||||
["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "",
|
ids.Add(WmsWareHouseConst.AdministratorOrgId);
|
||||||
["cvendorid"] = "",
|
ids.Add(wmsMaterialTransfer.warehouse_outstock);
|
||||||
["cvendorvid"] = "",
|
ids.Add(wmsMaterialTransfer.warehouse_instock);
|
||||||
["dbizdate"] = nowStr,
|
ids.Add(wmsMaterialTransferd.material_id);
|
||||||
["nnum"] = wmsCarryCodes.Sum(r => r.codeqty),
|
if (unitData != null)
|
||||||
["nshouldnum"] = wmsMaterialTransferd.qty,
|
{
|
||||||
["pk_group"] = erpOrg.pk_group,
|
ids.Add(unitData.Id);
|
||||||
["pk_org"] = erpOrg.pk_org,
|
}
|
||||||
["pk_org_v"] = erpOrg.pk_org_v,
|
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => ids.Contains(x.table_id)).ToListAsync();
|
||||||
["vbatchcode"] = wmsMaterialTransferd.code_batch,
|
|
||||||
});
|
|
||||||
erpRequestData.Add("dtls",erpRequestDataDetails);
|
|
||||||
requestData.Add(erpRequestData);
|
|
||||||
|
|
||||||
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
|
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId));
|
||||||
thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
|
string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? "";
|
||||||
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
|
|
||||||
thirdWebapiRecord.name = "其它出库";
|
|
||||||
thirdWebapiRecord.method = "POST";
|
|
||||||
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/generalout/save";
|
|
||||||
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
|
|
||||||
thirdWebapiRecord.create_time = DateTime.Now;
|
|
||||||
|
|
||||||
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
|
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
|
||||||
|
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
|
||||||
|
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
erpRequestData.Add("billmaker", erpCreateId);
|
||||||
|
erpRequestData.Add("cdptid", "1001A1100000000JRLI1");// 先写死
|
||||||
|
erpRequestData.Add("cdptvid", "0001A11000000007GGO8");// 先写死
|
||||||
|
erpRequestData.Add("corpoid", erpOrg.corpoid);
|
||||||
|
erpRequestData.Add("corpvid", erpOrg.corpoid);
|
||||||
|
erpRequestData.Add("cothercalbodyoid", erpOrg.pk_org);
|
||||||
|
erpRequestData.Add("cotherwhid", erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "");
|
||||||
|
erpRequestData.Add("creationtime", nowStr);
|
||||||
|
erpRequestData.Add("creator", erpCreateId);
|
||||||
|
erpRequestData.Add("ctrantypeid", "0001H11000000000D31W");
|
||||||
|
erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "");
|
||||||
|
erpRequestData.Add("dbilldate", nowStr);
|
||||||
|
erpRequestData.Add("dmakedate", nowStr);
|
||||||
|
erpRequestData.Add("ntotalnum", wmsCarryCodes.Sum(r => r.codeqty));
|
||||||
|
erpRequestData.Add("pk_group", erpOrg.pk_group);
|
||||||
|
erpRequestData.Add("pk_org", erpOrg.pk_org);
|
||||||
|
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
|
||||||
|
erpRequestData.Add("vbillcode", wmsMaterialTransfer.bill_code);
|
||||||
|
erpRequestData.Add("vtrantypecode", "4I-01");//其他出库 先写死
|
||||||
|
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
|
||||||
|
erpRequestDataDetails.Add(new Dictionary<string, object>()
|
||||||
|
{
|
||||||
|
["cbodytranstypecode"] = "4I-01",
|
||||||
|
["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "",
|
||||||
|
["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransferd.material_id)?.cmaterialoid ?? "",
|
||||||
|
["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransferd.material_id)?.cmaterialvid ?? "",
|
||||||
|
["corpoid"] = erpOrg.corpoid,
|
||||||
|
["corpvid"] = erpOrg.corpvid,
|
||||||
|
["crowno"] = wmsMaterialTransferd.lineno,
|
||||||
|
["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk,
|
||||||
|
["csourcebillhid"] = wmsMaterialTransfer.erp_pk,
|
||||||
|
["cunitid"] = erpExtendFields.Find(x => x.table_id == unitData.Id)?.cunitid ?? "",
|
||||||
|
["cvendorid"] = "",
|
||||||
|
["cvendorvid"] = "",
|
||||||
|
["dbizdate"] = nowStr,
|
||||||
|
["nnum"] = wmsCarryCodes.Sum(r => r.codeqty),
|
||||||
|
["nshouldnum"] = wmsMaterialTransferd.qty,
|
||||||
|
["pk_group"] = erpOrg.pk_group,
|
||||||
|
["pk_org"] = erpOrg.pk_org,
|
||||||
|
["pk_org_v"] = erpOrg.pk_org_v,
|
||||||
|
["vbatchcode"] = wmsMaterialTransferd.code_batch,
|
||||||
|
});
|
||||||
|
erpRequestData.Add("dtls", erpRequestDataDetails);
|
||||||
|
requestData.Add(erpRequestData);
|
||||||
|
|
||||||
|
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
|
||||||
|
thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
|
||||||
|
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
|
||||||
|
thirdWebapiRecord.name = "其它出库";
|
||||||
|
thirdWebapiRecord.method = "POST";
|
||||||
|
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save";
|
||||||
|
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
|
||||||
|
thirdWebapiRecord.create_time = DateTime.Now;
|
||||||
|
|
||||||
|
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
await _db.Ado.CommitTranAsync();
|
await _db.Ado.CommitTranAsync();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user