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-08-20 17:58:52 +08:00
parent b28ffc9dea 2514319c33
commit 241d6ae94c
7 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,5 +24,10 @@ namespace Tnb.BasicData
/// 空载具出库数量
/// </summary>
public const string EmptyCarryOutNum = "EmptyCarryOutNum";
/// <summary>
/// BIP地址
/// </summary>
public const string BIPURL = "bipUrl";
}
}

36
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -569,9 +569,10 @@
public const string BIP = "BIP";
/// <summary>
/// 第三方 bip
/// 第三方 bip 地址
/// </summary>
public const string BIP_DOMAIN = "http://192.168.1.11:8087/";
// public const string BIP_DOMAIN = "http://192.168.1.11:8087/";//测试地址
public const string BIP_DOMAIN = "http://192.168.0.145:8089/";//正式地址
/// <summary>
/// 单位类型id
@@ -617,5 +618,36 @@
/// 天益供应商id
/// </summary>
public const string TIANYIGONGYINGSHANG_ID = "35770039572253";
/// <summary>
/// 首检id
/// </summary>
public const string SHOUJIAN_ID = "26589795199765";
/// <summary>
/// 巡检id
/// </summary>
public const string XUNJIAN_ID = "26590141686549";
/// <summary>
/// 末检id
/// </summary>
public const string MOJIAN_ID = "26589783783701";
/// <summary>
/// 零部件最终检验id
/// </summary>
public const string LINGBUJIANZUIZHONGJIANYAN_ID = "36080445300245";
/// <summary>
/// 成品检验id
/// </summary>
public const string CHENGPINJIANYAN_ID = "30170148375573";
/// <summary>
/// 全检
/// </summary>
public const string FULLREVIEW_CODE = "FullReview";
}
}

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs
View File

@@ -139,7 +139,7 @@ public partial class WmsPurchaseD : BaseEntity<string>
/// </summary>
public string erp_wh_type { get; set; }
//public string lineno { get; set; }
public string lineno { get; set; }
public string erp_purchase_order_d_pk { get; set; }

3
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -2692,12 +2692,13 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("dtls",erpRequestDataDetails);
requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
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/generalin/save";
thirdWebapiRecord.url = config.value+"uapws/rest/generalin/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now;

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

@@ -424,13 +424,14 @@ namespace Tnb.WarehouseMgr
}
erpRequestData.Add("dtls", erpRequestDataDetails);
requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
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/purchaseIn/save";
thirdWebapiRecord.url = config.value + "uapws/rest/purchaseIn/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now;
thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "");
@@ -538,13 +539,13 @@ namespace Tnb.WarehouseMgr
}
erpRequestData.Add("dtls", erpRequestDataDetails);
requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
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/transIn/save";
thirdWebapiRecord.url = config.value + "uapws/rest/transIn/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now;
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();

11
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -1082,12 +1082,13 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("dtls", erpRequestDataDetails);
requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
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.url = config.value + "uapws/rest/generalout/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now;
@@ -1952,7 +1953,13 @@ namespace Tnb.WarehouseMgr
List<PrdMaterialReceiptH> insertHList = new List<PrdMaterialReceiptH>();
List<PrdMaterialReceiptD> insertDList = new List<PrdMaterialReceiptD>();
string orgId = WmsWareHouseConst.AdministratorOrgId;
string userId = moTask.worker_id;
// string userId = moTask.worker_id;
string userId = WmsWareHouseConst.AdministratorUserId;
if (_userManager != null && !string.IsNullOrEmpty(_userManager.UserId))
{
userId = _userManager.UserId;
}
foreach(string carryId in input.carryIds)
{
WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId);

20
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -143,6 +143,7 @@ namespace Tnb.WarehouseMgr
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
.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);
@@ -216,16 +217,15 @@ namespace Tnb.WarehouseMgr
["pk_arriveorder"] = null,
["pk_arriveorder_b"] = null,
["pk_group"] = erpOrg.pk_group,
["csourcebid"] = item.erp_purchase_order_d_pk,
["csourceid"] = wmsPurchaseOrderH?.erp_pk ?? "",
["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_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v,
["pk_psfinanceorg"] = erpOrg.pk_org_v,
["pk_psfinanceorg"] = erpOrg.pk_org,
["pk_psfinanceorg_v"] = erpOrg.pk_org_v,
["pk_receivestore"] = erpExtendFields.Find(x=>x.table_id==purchase.warehouse_id)?.cotherwhid ?? "",
// ["pk_receivestore"] = erpExtendFields.Find(x=>x.table_id==purchase.warehouse_id)?.cotherwhid ?? "",
["pk_receivestore"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == item.erp_wh_type)?.erp_warehouseid ?? "",
["pk_reqstoorg"] = erpOrg.pk_org,
["pk_reqstoorg_v"] = erpOrg.pk_org_v,
["pk_srcmaterial"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "",
@@ -233,17 +233,25 @@ namespace Tnb.WarehouseMgr
["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,
["IsType"] = 0,
["csourcetypecode"] = null,
["vsourcerowno"] = null,
["vsourcetrantype"] = null,
});
}
erpRequestData.Add("dtls",erpRequestDataDetails);
requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
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/purarrvial/save";
thirdWebapiRecord.url = config.value+"uapws/rest/purarrvial/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
thirdWebapiRecord.create_time = DateTime.Now;