委外到货
This commit is contained in:
@@ -188,19 +188,27 @@ namespace Tnb.WarehouseMgr
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<dynamic> Purchase(PurchaseAndReceiveUpInput input)
|
||||
public async Task<dynamic> Purchase(OutsourceEditInput input)
|
||||
{
|
||||
var blFlag = true;
|
||||
try
|
||||
{
|
||||
WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().Where(r => r.bill_code == input.bill_code).FirstAsync();
|
||||
if (wmsPurchaseH.make_method == "自制")
|
||||
WmsOutsourceH wmsOutsourceH = await _db.Queryable<WmsOutsourceH>().Where(r => r.bill_code == input.bill_code).FirstAsync();
|
||||
if (wmsOutsourceH.make_method == "自制")
|
||||
{
|
||||
throw Oops.Bah("自制采购收货单不能操作此按钮");
|
||||
throw Oops.Bah("自制委外收货单不能操作此按钮");
|
||||
}
|
||||
await _db.Ado.BeginTranAsync();
|
||||
WmsInstockH? instock = null;
|
||||
var purchaseDs = await PurchaseAndSaleUpdate(input);
|
||||
var purchaseDs = input.details;
|
||||
foreach (var item in input.details)
|
||||
{
|
||||
await _db.Updateable<WmsOutsourceOrderD>()
|
||||
.SetColumns(x => x.actual_quantity == x.actual_quantity + item.bind_qty)
|
||||
.Where(x => x.id == item.outsource_order_d_id)
|
||||
.ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
List<WmsInstockD> instockDs = new();
|
||||
if (purchaseDs?.Count > 0)
|
||||
{
|
||||
@@ -233,28 +241,8 @@ namespace Tnb.WarehouseMgr
|
||||
});
|
||||
await _db.Insertable(instockDs).ExecuteCommandAsync();
|
||||
|
||||
var purchase = await _db.Queryable<WmsPurchaseH>().FirstAsync(it => it.id == purchaseDs.First().bill_id);
|
||||
|
||||
if (string.IsNullOrEmpty(purchase.supplier_id))
|
||||
{
|
||||
BasSupplier basSupplier = await _db.Queryable<BasSupplier>().Where(x => x.supplier_code == purchase.supplier_code).FirstAsync();
|
||||
if (basSupplier != null)
|
||||
{
|
||||
await _db.Updateable<WmsPurchaseH>()
|
||||
.SetColumns(x => x.supplier_id == basSupplier.id)
|
||||
.Where(x => x.id == purchase.id)
|
||||
.ExecuteCommandAsync();
|
||||
|
||||
purchase.supplier_id = basSupplier.id;
|
||||
}
|
||||
}
|
||||
|
||||
//purchase.supplier_code
|
||||
|
||||
|
||||
|
||||
List<WmsPurchaseD> dList = await _db.Queryable<WmsPurchaseD>().Where(x => x.bill_id == purchaseDs.First().bill_id).OrderBy(x => x.id).ToListAsync();
|
||||
List<String> materialIds = purchaseDs.Select(x => x.material_id).Distinct().ToList();
|
||||
List<WmsOutsourceD> dList = input.details;
|
||||
List<String> materialIds = purchaseDs.Select(x => x.matcode_id).Distinct().ToList();
|
||||
List<String> unitCodes = purchaseDs.Select(x => x.unit_id).Distinct().ToList();
|
||||
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
|
||||
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
|
||||
@@ -262,20 +250,17 @@ namespace Tnb.WarehouseMgr
|
||||
.Select((x, y) => y)
|
||||
.ToListAsync();
|
||||
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x => x.id != null).ToListAsync();
|
||||
WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable<WmsPurchaseOrderH>().SingleAsync(x => x.id == purchase.erp_bill_code);
|
||||
//todo 先取采购订单第一条
|
||||
//WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code);
|
||||
WmsOutsourceOrderH wmsOutsourceOrderH = await _db.Queryable<WmsOutsourceOrderH>().SingleAsync(x => x.id == wmsOutsourceH.erp_bill_code);
|
||||
|
||||
//自制的不调erp接口
|
||||
if (!string.IsNullOrEmpty(wmsPurchaseOrderH.erp_bill_code))
|
||||
if (!string.IsNullOrEmpty(wmsOutsourceOrderH.erp_bill_code))
|
||||
{
|
||||
List<string> ids = new List<string>();
|
||||
// ids.Add(_userManager.UserId);
|
||||
// ids.Add(WmsWareHouseConst.AdministratorUserId);
|
||||
ids.Add(WmsWareHouseConst.AdministratorOrgId);
|
||||
ids.Add(purchase.warehouse_id);
|
||||
ids.AddRange(materialIds);
|
||||
ids.Add(wmsPurchaseOrderH.supplier_id);
|
||||
ids.Add(wmsOutsourceOrderH.supplier_id);
|
||||
ids.AddRange(unitDatas.Select(x => x.Id).ToList());
|
||||
|
||||
string userId = _userManager.UserId ?? WmsWareHouseConst.AdministratorUserId;
|
||||
@@ -292,9 +277,9 @@ namespace Tnb.WarehouseMgr
|
||||
erpRequestData.Add("billmaker", erpCreateId);
|
||||
erpRequestData.Add("creationtime", nowStr);
|
||||
erpRequestData.Add("creator", erpCreateId);
|
||||
erpRequestData.Add("dbilldate", purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
|
||||
erpRequestData.Add("dbilldate", wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
|
||||
erpRequestData.Add("dmakedate", nowStr);
|
||||
erpRequestData.Add("ntotalastnum", purchaseDs.Sum(x => x.purchase_arriveqty));
|
||||
erpRequestData.Add("ntotalastnum", purchaseDs.Sum(x => x.bind_qty));
|
||||
erpRequestData.Add("pk_arriveorder", null);
|
||||
// erpRequestData.Add("pk_dept","1001A1100000001JFOPQ");
|
||||
// erpRequestData.Add("pk_dept_v","0001A1100000000AOMIQ");
|
||||
@@ -303,48 +288,48 @@ namespace Tnb.WarehouseMgr
|
||||
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
|
||||
erpRequestData.Add("pk_group", erpOrg.pk_group);
|
||||
erpRequestData.Add("pk_pupsndoc", "");
|
||||
erpRequestData.Add("csourceid", wmsPurchaseOrderH?.erp_pk ?? "");
|
||||
erpRequestData.Add("csourceid", wmsOutsourceOrderH?.erp_pk ?? "");
|
||||
erpRequestData.Add("pk_purchaseorg", erpOrg.pk_org);
|
||||
erpRequestData.Add("pk_purchaseorg_v", erpOrg.pk_org_v);
|
||||
erpRequestData.Add("pk_supplier", erpExtendFields.Find(x => x.table_id == purchase.supplier_id)?.supplier_id ?? "");//先写死
|
||||
erpRequestData.Add("pk_supplier_v", erpExtendFields.Find(x => x.table_id == purchase.supplier_id)?.supplier_vid ?? "");//先写死
|
||||
erpRequestData.Add("vbillcode", purchase.bill_code);
|
||||
erpRequestData.Add("vmemo", purchase.remark);
|
||||
erpRequestData.Add("pk_supplier", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_id ?? "");//先写死
|
||||
erpRequestData.Add("pk_supplier_v", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_vid ?? "");//先写死
|
||||
erpRequestData.Add("vbillcode", wmsOutsourceH.bill_code);
|
||||
erpRequestData.Add("vmemo", wmsOutsourceH.remark);
|
||||
erpRequestData.Add("vtrantypecode", "");
|
||||
|
||||
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
|
||||
foreach (WmsPurchaseD item in dList)
|
||||
foreach (WmsOutsourceD item in dList)
|
||||
{
|
||||
erpRequestDataDetails.Add(new Dictionary<string, object>()
|
||||
{
|
||||
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
|
||||
["cfirstbid"] = wmsPurchaseOrderH?.erp_pk ?? "",
|
||||
["cfirstid"] = item.erp_purchase_order_d_pk,
|
||||
["cfirstbid"] = wmsOutsourceOrderH?.erp_pk ?? "",
|
||||
["cfirstid"] = item.erp_outsource_order_d_pk,
|
||||
["cfirsttypecode"] = "",
|
||||
["crececountryid"] = "0001Z010000000079UJJ",
|
||||
["crowno"] = item.erp_purchase_order_d_lineno,
|
||||
["crowno"] = item.erp_outsource_order_d_lineno,
|
||||
["csendcountryid"] = "0001Z010000000079UJJ",
|
||||
["csourcetypecode"] = "",
|
||||
["ctaxcountryid"] = "0001Z010000000079UJJ",
|
||||
["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
|
||||
["dbilldate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["dplanreceivedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["dproducedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["dbilldate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["dplanreceivedate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["dproducedate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
// ["fbuysellflag"] = 2,
|
||||
["fproductclass"] = 1,
|
||||
// ["naccumchecknum"] = 0,
|
||||
// ["nastnum"] = item.purchase_arriveqty,
|
||||
["nnum"] = item.purchase_arriveqty,
|
||||
["nnum"] = item.bind_qty,
|
||||
// ["nplanastnum"] = 0,
|
||||
["nplannum"] = item.purchase_qty,
|
||||
["nplannum"] = item.outsource_qty,
|
||||
["pk_apfinanceorg"] = erpOrg.corpoid,
|
||||
["pk_apfinanceorg_v"] = erpOrg.corpvid,
|
||||
["pk_arriveorder"] = null,
|
||||
["pk_arriveorder_b"] = null,
|
||||
["pk_group"] = erpOrg.pk_group,
|
||||
["pk_material"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "",
|
||||
["pk_order"] = wmsPurchaseOrderH?.erp_pk ?? "",
|
||||
["pk_order_b"] = item.erp_purchase_order_d_pk,
|
||||
["pk_material"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid ?? "",
|
||||
["pk_order"] = wmsOutsourceOrderH?.erp_pk ?? "",
|
||||
["pk_order_b"] = item.erp_outsource_order_d_pk,
|
||||
["pk_org"] = erpOrg.pk_org,
|
||||
["pk_org_v"] = erpOrg.pk_org_v,
|
||||
["pk_psfinanceorg"] = erpOrg.corpoid,
|
||||
@@ -354,14 +339,14 @@ namespace Tnb.WarehouseMgr
|
||||
["pk_receivestore"] = item.erp_wh_type,
|
||||
["pk_reqstoorg"] = erpOrg.pk_org,
|
||||
["pk_reqstoorg_v"] = erpOrg.pk_org_v,
|
||||
["pk_srcmaterial"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "",
|
||||
["pk_srcmaterial"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid ?? "",
|
||||
["vbatchcode"] = item.code_batch,
|
||||
["Vfree1"] = item.code_batch,
|
||||
["mes_detail_id"] = item.id,
|
||||
["bpresent"] = item.gift == 1,
|
||||
["csourceid"] = wmsPurchaseOrderH?.erp_pk ?? "",
|
||||
["vsourcecode"] = wmsPurchaseOrderH.erp_bill_code,
|
||||
["csourcebid"] = item.erp_purchase_order_d_pk,
|
||||
["csourceid"] = wmsOutsourceOrderH?.erp_pk ?? "",
|
||||
["vsourcecode"] = wmsOutsourceOrderH.erp_bill_code,
|
||||
["csourcebid"] = item.erp_outsource_order_d_pk,
|
||||
["IsType"] = 0,
|
||||
["csourcetypecode"] = null,
|
||||
["vsourcerowno"] = null,
|
||||
@@ -376,13 +361,13 @@ namespace Tnb.WarehouseMgr
|
||||
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
|
||||
thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
|
||||
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
|
||||
thirdWebapiRecord.name = "采购到货";
|
||||
thirdWebapiRecord.name = "委外到货";
|
||||
thirdWebapiRecord.method = "POST";
|
||||
// thirdWebapiRecord.url = config.value+"uapws/rest/purarrvial/save";
|
||||
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purarrvial/save";
|
||||
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
|
||||
thirdWebapiRecord.create_time = DateTime.Now;
|
||||
thirdWebapiRecord.remark = $"【WmsPurchaseService Purchase】erp采购订单:{wmsPurchaseOrderH.erp_bill_code}";
|
||||
thirdWebapiRecord.remark = $"【WmsOutsourceService Purchase】erp委外订单:{wmsOutsourceOrderH.erp_bill_code}";
|
||||
|
||||
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
|
||||
BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);
|
||||
@@ -402,7 +387,7 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
blFlag = false;
|
||||
await _db.Ado.RollbackTranAsync();
|
||||
Log.Error("采购收货失败", ex);
|
||||
Log.Error("委外收货失败", ex);
|
||||
throw;
|
||||
}
|
||||
return await Task.FromResult(blFlag);
|
||||
|
||||
Reference in New Issue
Block a user