From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 ：单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端：外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表：(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发
---
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 0f078a3..392f02f 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -139,7 +139,7 @@
}
if (i == Convert.ToInt32(ordernum)) //鏈�鍚庝竴鍗曟椂
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
list.Add(new
{
str = sql,
@@ -155,7 +155,8 @@
sourceid = erporderid,
m_po = erpordercode,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
}
});
sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
@@ -163,7 +164,7 @@
else
{
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
list.Add(new
{
str = sql,
@@ -3539,10 +3540,11 @@
string[] s1 = Array.ConvertAll<string, string>(str.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
//string s1 = string.Format("'{0}'", str.Replace(",", "','"));
- string sql = @"select B.wo_code, B.eqp_code,B.time_start,B.time_end, 'S' status , B.alloc_qty,D.partname as part_name
+ string sql = @"select B.wo_code, B.eqp_code,B.time_start,B.time_end, 'S' status , B.alloc_qty,D.partcode as part_code,D.partname as part_name,T.name as uom_name
from TK_Wrk_EqpAps B
left join TK_Wrk_Man C on B.wo_code=C.wo_code
left join TMateriel_Info D on C.materiel_code=D.partcode
+ left join TUom T on D.uom_code=T.code
where B.eqp_code in @eqpcode
and convert(varchar(100),B.Time_Start,21)>=@startdate and convert(varchar(100),B.Time_End,21)<=@enddate order by time_end";
dt = DapperHelper.selectlist(sql, new { eqpcode = s1.ToArray(), startdate= startdate + " 00:00:00", enddate= enddate + " 23:59:59" });
--
Gitblit v1.9.3