From cf2dffc61f8c8734dc611ef9bd0eccc0bb3806ae Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 五月 2024 16:04:59 +0800
Subject: [PATCH] 1.ERP订单、MES工单列表新增顶级物料编码、顶级物料名称 2.ERP订单派发接口增加顶级物料id、顶级物料编码、顶级物料名称
---
VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs | 4 +-
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 48 +++++++++++++++--------
VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs | 12 ++++++
VueWebCoreApi/Controllers/WorkOrderController.cs | 5 ++
VueWebCoreApi/Models/WorkData/WorkList.cs | 4 ++
5 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index dcf03cc..2180029 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -95,8 +95,11 @@
string markqty = obj["markqty"].ToString(); //涓嬪崟鏁伴噺
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
+ string idTopInventory = obj["idTopInventory"].ToString(); //椤剁骇鐗╂枡id
+ string TopInventoryCode = obj["TopInventoryCode"].ToString(); //椤剁骇鐗╂枡缂栫爜
+ string TopInventoryName = obj["TopInventoryName"].ToString(); //椤剁骇鐗╂枡鍚嶇О
string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
- mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,us);
+ mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, idTopInventory, TopInventoryCode, TopInventoryName, us);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
index 929d717..5d7589d 100644
--- a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
@@ -24,9 +24,9 @@
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erporderid,string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, User us)
+ public static ToMessage MarkSaveErpOrder(string erporderid,string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate,string idTopInventory,string TopInventoryCode,string TopInventoryName, User us)
{
- return WorkOrderDAL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, us);
+ return WorkOrderDAL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, idTopInventory, TopInventoryCode, TopInventoryName, us);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 2630e2c..fcc0cb5 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -92,7 +92,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.torg_name as wkshp_name,
+ var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.idTopInventory,A.TopInventoryCode,A.TopInventoryName,A.qty,A.relse_qty,A.wkshp_code,C.torg_name as wkshp_name,
A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid
from TKimp_Ewo A
left join TMateriel_Info B on A.materiel_code=B.partcode
@@ -118,7 +118,7 @@
#endregion
#region[ERP璁㈠崟涓嬭揪]
- public static ToMessage MarkSaveErpOrder(string erporderid, string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, User us)
+ public static ToMessage MarkSaveErpOrder(string erporderid, string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate,string idTopInventory,string TopInventoryCode,string TopInventoryName, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -156,7 +156,8 @@
}
if (i == Convert.ToInt32(ordernum)) //鏈�鍚庝竴鍗曟椂
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,idTopInventory,TopInventoryCode,TopInventoryName)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@idTopInventory,@TopInventoryCode,@TopInventoryName)";
list.Add(new
{
str = sql,
@@ -177,7 +178,10 @@
saleOrderCode = saleordercode,
saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
data_sources = "ERP",
- isstep = "N" //鏄惁鍏宠仈宸ュ簭
+ isstep = "N", //鏄惁鍏宠仈宸ュ簭
+ idTopInventory=idTopInventory,
+ TopInventoryCode=TopInventoryCode,
+ TopInventoryName=TopInventoryName
}
});
sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
@@ -185,7 +189,8 @@
else
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,idTopInventory,TopInventoryCode,TopInventoryName)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@idTopInventory,@TopInventoryCode,@TopInventoryName)";
list.Add(new
{
str = sql,
@@ -206,7 +211,10 @@
saleOrderCode = saleordercode,
saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate),
data_sources = "ERP",
- isstep = "N"//鏄惁鍏宠仈宸ュ簭
+ isstep = "N",//鏄惁鍏宠仈宸ュ簭
+ idTopInventory = idTopInventory,
+ TopInventoryCode = TopInventoryCode,
+ TopInventoryName = TopInventoryName
}
});
}
@@ -298,7 +306,8 @@
string wo = model.erpordercode + "_" + (num + count);
result += wo.ToString() + ",";
//鍐欏叆宸ュ崟琛�
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep,idTopInventory,TopInventoryCode,TopInventoryName)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep,@idTopInventory,@TopInventoryCode,@TopInventoryName)";
list.Add(new
{
str = sql,
@@ -319,7 +328,10 @@
saleOrderCode = model.saleordercode,
saleOrderDeliveryDate = Convert.ToDateTime(model.saleOrderDeliveryDate),
data_sources = "ERP",
- isstep = "N" //鏄惁鍏宠仈宸ュ簭
+ isstep = "N", //鏄惁鍏宠仈宸ュ簭
+ idTopInventory = model.idTopInventory,
+ TopInventoryCode = model.TopInventoryCode,
+ TopInventoryName = model.TopInventoryName
}
});
@@ -636,7 +648,7 @@
}
if (saleordercode != "" && saleordercode != null)
{
- search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
+ search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
dynamicParams.Add("@saleordercode", saleordercode);
}
if (ordertype != "" && ordertype != null)
@@ -676,8 +688,8 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
- A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep
+ var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.idTopInventory,A.TopInventoryCode,A.TopInventoryName,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
+ A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,A.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep
from TK_Wrk_Man A
left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
left join TMateriel_Info B on A.materiel_code=B.partcode
@@ -727,7 +739,7 @@
}
if (saleordercode != "" && saleordercode != null)
{
- search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
+ search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
dynamicParams.Add("@saleordercode", saleordercode);
}
if (partcode != "" && partcode != null)
@@ -762,8 +774,8 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
- A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,S.laborbad_qty,S.materielbad_qty
+ var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.idTopInventory,A.TopInventoryCode,A.TopInventoryName,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
+ A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,A.saleOrderCode,U.username as lm_user,A.lm_date,S.laborbad_qty,S.materielbad_qty
from TK_Wrk_Man A
left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
left join (select wo_code,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty from TK_Wrk_Step where (laborbad_qty+materielbad_qty)>0 group by wo_code) S on A.wo_code=S.wo_code
@@ -896,8 +908,8 @@
if (operType == "Add")
{
//鍐欏叆宸ュ崟琛�
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,sourceid,m_po,saleOrderDeliveryDate,piroque,isaps,data_sources,isstep)
- values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@sourceid,@m_po,@saleOrderDeliveryDate,@orderlev,@isaps,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,sourceid,m_po,saleOrderCode,saleOrderDeliveryDate,piroque,isaps,data_sources,isstep)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@sourceid,@m_po,@saleOrderCode,@saleOrderDeliveryDate,@orderlev,@isaps,@data_sources,@isstep)";
list.Add(new
{
str = sql,
@@ -913,6 +925,7 @@
materiel_code = json.partcode,
sourceid = json.sourceid == "" ? null : json.sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
m_po = json.sourcewo,
+ saleOrderCode=json.saleordercode,
saleOrderDeliveryDate = json.deliverydate,
orderlev = "3",//浼樺厛绾э細鐗圭骇锛�1锛� 绱ф�ワ紙2锛� 姝ｅ父锛�3锛�
isaps = "N", //鏄惁鎺掍骇,榛樿N Y=鏄� N=鍚�
@@ -965,7 +978,7 @@
{
//淇敼宸ュ崟琛�
sql = @"update TK_Wrk_Man set wotype=@wotype,wkshp_code=@wkshp_code,plan_qty=@plan_qty,lm_user=@lm_user,lm_date=@lm_date,
- materiel_code=@materiel_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,isstep=@isstep
+ materiel_code=@materiel_code,sourceid=@sourceid,m_po=@m_po,saleOrderCode=@saleOrderCode,saleOrderDeliveryDate=@saleOrderDeliveryDate,isstep=@isstep
where wo_code=@wo_code";
list.Add(new
{
@@ -979,6 +992,7 @@
materiel_code = json.partcode,
sourceid = json.sourceid == "" ? null : json.sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
m_po = json.sourcewo,
+ saleOrderCode=json.saleordercode,
saleOrderDeliveryDate = json.deliverydate,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
diff --git a/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs b/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs
index 08950de..ba56695 100644
--- a/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs
+++ b/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs
@@ -55,5 +55,17 @@
/// 浜や粯鏃堕棿
/// </summary>
public string saleOrderDeliveryDate { get; set; }
+ /// <summary>
+ /// 椤剁骇鐗╂枡缂杋d
+ /// </summary>
+ public string idTopInventory { get; set; }
+ /// <summary>
+ /// 椤剁骇鐗╂枡缂栫爜
+ /// </summary>
+ public string TopInventoryCode { get; set; }
+ /// <summary>
+ /// 椤剁骇鐗╂枡鍚嶇О
+ /// </summary>
+ public string TopInventoryName { get; set; }
}
}
diff --git a/VueWebCoreApi/Models/WorkData/WorkList.cs b/VueWebCoreApi/Models/WorkData/WorkList.cs
index a63a0e6..1ce5ae6 100644
--- a/VueWebCoreApi/Models/WorkData/WorkList.cs
+++ b/VueWebCoreApi/Models/WorkData/WorkList.cs
@@ -51,6 +51,10 @@
/// 鏄惁鍏宠仈宸ュ簭
/// </summary>
public string isstep { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ public string saleordercode { get; set; }
public List<WorkListSub> WorkListSub { get; set; }
}
public class WorkListSub
--
Gitblit v1.9.3