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-07-31 15:29:44 +08:00
parent 446346e13f
commit 5df23e01ee
4 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BasicData/Tnb.BasicData.Entities/Entity/ThirdWebapiRecord.cs
View File

@@ -74,5 +74,9 @@ namespace Tnb.BasicData.Entities
/// </summary> /// </summary>
public DateTime? last_send_time { get; set; } public DateTime? last_send_time { get; set; }
/// <summary>
/// 备注
/// </summary>
public string remark { get; set; }
} }
} }

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

@@ -743,14 +743,14 @@ namespace Tnb.ProductionMgr
row = await db.Insertable(moTask).ExecuteCommandAsync(); row = await db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块 #region 质检模块
//质检 //质检
TriggerPlanEntity entity = new() // TriggerPlanEntity entity = new()
{ // {
materialid = moTask.material_id, // materialid = moTask.material_id,
processid = moTask.process_id, // processid = moTask.process_id,
workid = moTask.workstation_id, // workid = moTask.workstation_id,
triggerevent = EnumTriggerEvent.首件检新的生产任务 // triggerevent = EnumTriggerEvent.首件检新的生产任务
}; // };
await _qcCheckPlanService.CreateTask(entity); // await _qcCheckPlanService.CreateTask(entity);
#endregion #endregion
//根据工单号获取当前工单包含的已排产数 //根据工单号获取当前工单包含的已排产数
int? schedQty = db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty); int? schedQty = db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
@@ -821,6 +821,7 @@ namespace Tnb.ProductionMgr
{ {
Log.Error(e.Message,e); Log.Error(e.Message,e);
await db.Ado.RollbackTranAsync(); await db.Ado.RollbackTranAsync();
throw Oops.Bah(e.Message);
} }
} }
else if (input.schedule_type.Value == 2) //组装、包装排产 else if (input.schedule_type.Value == 2) //组装、包装排产
@@ -885,14 +886,14 @@ namespace Tnb.ProductionMgr
row = await _db.Insertable(moTask).ExecuteCommandAsync(); row = await _db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块 #region 质检模块
//质检 //质检
TriggerPlanEntity entity = new() // TriggerPlanEntity entity = new()
{ // {
materialid = moTask.material_id, // materialid = moTask.material_id,
processid = moTask.process_id, // processid = moTask.process_id,
workid = moTask.workstation_id, // workid = moTask.workstation_id,
triggerevent = EnumTriggerEvent.首件检新的生产任务 // triggerevent = EnumTriggerEvent.首件检新的生产任务
}; // };
await _qcCheckPlanService.CreateTask(entity); // await _qcCheckPlanService.CreateTask(entity);
#endregion #endregion
@@ -1055,6 +1056,7 @@ namespace Tnb.ProductionMgr
{ {
JNPF.Logging.Log.Error("组装包装排产时报错", ex); JNPF.Logging.Log.Error("组装包装排产时报错", ex);
await _db.Ado.RollbackTranAsync(); await _db.Ado.RollbackTranAsync();
throw Oops.Bah(ex.Message);
} }
return row > 0; return row > 0;
} }

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

@@ -26,6 +26,7 @@ using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
using Tnb.ProductionMgr.Entities.Entity; using Tnb.ProductionMgr.Entities.Entity;
using Tnb.BasicData; using Tnb.BasicData;
using Tnb.WarehouseMgr.Entities.Entity;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
@@ -313,6 +314,21 @@ namespace Tnb.WarehouseMgr
_ = await _db.Updateable(instock).UpdateColumns(it => it.status).ExecuteCommandAsync(); _ = await _db.Updateable(instock).UpdateColumns(it => it.status).ExecuteCommandAsync();
WmsTempCode wmsTempCode = await _db.Queryable<WmsCarryCode>()
.LeftJoin<WmsTempCode>((a,b)=>a.barcode==b.barcode)
.Where((a,b) => a.carry_code == input.wmsDistaskH.carry_code)
.Select((a,b)=>b)
.FirstAsync();
string purchaseDId = wmsTempCode?.require_id ?? "";
WmsPurchaseD wmsPurchaseD = await _db.Queryable<WmsPurchaseD>().SingleAsync(x=>x.id==purchaseDId);
string purchaseHId = wmsPurchaseD?.bill_id ?? "";
WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().SingleAsync(x=>x.id==purchaseHId);
string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? "";
WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable<WmsPurchaseOrderH>().SingleAsync(x=>x.id==wmsPurchaseOrderHId);
WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x=>x.fk_wms_purchase_order_id==wmsPurchaseOrderHId);
List<String> materialIds = allInstockDetails.Select(x=>x.material_id).Distinct().ToList(); List<String> materialIds = allInstockDetails.Select(x=>x.material_id).Distinct().ToList();
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>() List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
@@ -344,7 +360,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("corpvid",erpOrg.corpvid); erpRequestData.Add("corpvid",erpOrg.corpvid);
erpRequestData.Add("creationtime",nowStr); erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("ctrantypeid",""); erpRequestData.Add("ctrantypeid",wmsPurchaseH?.transaction_type ?? "");
erpRequestData.Add("cvendorid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? ""); erpRequestData.Add("cvendorid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "");
erpRequestData.Add("cvendorvid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_vid ?? ""); erpRequestData.Add("cvendorvid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_vid ?? "");
erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取
@@ -365,7 +381,7 @@ namespace Tnb.WarehouseMgr
erpRequestDataDetails.Add(new Dictionary<string, object>() erpRequestDataDetails.Add(new Dictionary<string, object>()
{ {
["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cbodytranstypecode"] = "", ["cbodytranstypecode"] = wmsPurchaseH?.transaction_type ?? "",
["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "", ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "",
["cgeneralbid"] = "", ["cgeneralbid"] = "",
["cgeneralhid"] = "", ["cgeneralhid"] = "",
@@ -386,6 +402,10 @@ namespace Tnb.WarehouseMgr
["pk_org_v"] = erpOrg.pk_org_v, ["pk_org_v"] = erpOrg.pk_org_v,
["pseudocolumn"] = (allInstockDetails.FindIndex(x=>x.id==item.id)+1) * 10, ["pseudocolumn"] = (allInstockDetails.FindIndex(x=>x.id==item.id)+1) * 10,
["vbatchcode"] = item.code_batch, ["vbatchcode"] = item.code_batch,
["csourcebillhid"] = wmsPurchaseOrderH?.erp_pk ?? "",
["csourcebillbid"] = wmsPurchaseOrderDs?.erp_line_pk ?? "",
["vsourcebillcode"] = wmsPurchaseOrderH?.erp_bill_code ?? "",
["lineno"] = wmsPurchaseOrderDs?.lineno ?? "",
["vfree1"] = erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "", ["vfree1"] = erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "",
}); });
@@ -401,6 +421,7 @@ namespace Tnb.WarehouseMgr
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purchaseIn/save"; thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purchaseIn/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 = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "");
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();

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

@@ -160,6 +160,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("pk_arriveorder",null); erpRequestData.Add("pk_arriveorder",null);
// erpRequestData.Add("pk_dept","1001A1100000000JRLI1"); // erpRequestData.Add("pk_dept","1001A1100000000JRLI1");
// erpRequestData.Add("pk_dept_v","0001A11000000007GGO8"); // erpRequestData.Add("pk_dept_v","0001A11000000007GGO8");
erpRequestData.Add("Pk_receivepsndoc",erpCreateId);
erpRequestData.Add("pk_org",erpOrg.pk_org); erpRequestData.Add("pk_org",erpOrg.pk_org);
erpRequestData.Add("pk_org_v",erpOrg.pk_org_v); erpRequestData.Add("pk_org_v",erpOrg.pk_org_v);
erpRequestData.Add("pk_group",erpOrg.pk_group); erpRequestData.Add("pk_group",erpOrg.pk_group);