From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index cbc86af..368e313 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -513,7 +513,7 @@
mes.code = "200";
mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
- LogHelper.OperateLog("999", "鏌ヨ", "瀛樿揣鍒嗙被鏌ヨ鏁版嵁涓猴細" + JsonConvert.SerializeObject(data), "PC");
+ //LogHelper.OperateLog("999", "鏌ヨ", "瀛樿揣鍒嗙被鏌ヨ鏁版嵁涓猴細" + JsonConvert.SerializeObject(data), "PC");
}
catch (Exception e)
{
@@ -1144,7 +1144,7 @@
sql = @"update TMateriel_Info set is_retdproc='N',default_route='' where partcode=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode } });
//娓呴櫎鑺傛媿宸ヤ环琛ㄥ搴旀暟鎹�
- sql = @"delete TPrteEqp_Stad where materiel_code=@partcode";
+ sql = @"delete TPrteStep_Price where materiel_code=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode } });
}
else
@@ -1167,22 +1167,16 @@
lm_date = DateTime.Now.ToString()
}
});
- //褰撳墠浜у搧宸ヨ壓璺嚎瀵瑰簲宸ュ簭鏄惁宸茶缃妭鎷嶅伐浠�
- sql = @"select * from TPrteEqp_Stad where materiel_code=@partcode and route_code=@routecode";
- dynamicParams.Add("@partcode", json[0].partcode);
- dynamicParams.Add("@routecode", json[0].children[i].code);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count<=0)
- {
- //娓呴櫎鑺傛媿宸ヤ环琛ㄥ搴旀暟鎹�
- sql = @"delete TPrteEqp_Stad where materiel_code=@partcode and route_code=@routecode";
- list.Add(new { str = sql, parm = new { partcode = json[0].partcode, routecode=json[0].children[i].code } });
- }
}
//鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
sql = @"update TMateriel_Info set is_retdproc='Y',default_route=@defaultroute_code where partcode=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode, defaultroute_code = json[0].defaultroute_code } });
-
+
+ //娓呴櫎鑺傛媿宸ヤ环琛ㄥ綋鍓嶄骇鍝佸搴斿伐鑹鸿矾绾夸笉鍖呭惈姝ゆ璁剧疆鐨勫叾瀹冩暟鎹�
+ //string鍒嗗壊杞瑂tring[]
+ string[] routcode = Array.ConvertAll<string, string>(string.Join(",", json[0].children.Select(s => s.code)).Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString());
+ sql = @"delete TPrteStep_Price where materiel_code=@partcode and route_code not in @routecode";
+ list.Add(new { str = sql, parm = new { partcode = json[0].partcode, routecode= routcode } });
}
}
else //宸ュ簭鐗�
@@ -1196,7 +1190,7 @@
sql = @"update TMateriel_Info set is_retdproc='N',default_route='' where partcode=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode } });
//娓呴櫎鑺傛媿宸ヤ环琛ㄥ搴旀暟鎹�
- sql = @"delete TPrteEqp_Stad where materiel_code=@partcode";
+ sql = @"delete TPrteStep_Price where materiel_code=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode } });
}
else
@@ -1223,22 +1217,16 @@
lm_date = DateTime.Now.ToString()
}
});
- //褰撳墠浜у搧瀵瑰簲宸ュ簭鏄惁宸茶缃妭鎷嶅伐浠�
- sql = @"select * from TPrteEqp_Stad where materiel_code=@partcode and step_code=@stepcode";
- dynamicParams.Add("@partcode", json[0].partcode);
- dynamicParams.Add("@stepcode", json[0].children[i].code);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count <= 0)
- {
- //娓呴櫎鑺傛媿宸ヤ环琛ㄥ搴旀暟鎹�
- sql = @"delete TPrteEqp_Stad where materiel_code=@partcode and step_code=@stepcode";
- list.Add(new { str = sql, parm = new { partcode = json[0].partcode, routecode = json[0].children[i].code } });
- }
}
//鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
sql = @"update TMateriel_Info set is_retdproc='Y',default_route=@defaultroute_code where partcode=@partcode";
list.Add(new { str = sql, parm = new { partcode = json[0].partcode, defaultroute_code = json[0].defaultroute_code } });
- //娓呴櫎鑺傛媿宸ヤ环琛ㄥ搴旀暟鎹�
+
+ //娓呴櫎鑺傛媿宸ヤ环琛ㄥ綋鍓嶄骇鍝佸搴斿伐搴忎笉鍖呭惈姝ゆ璁剧疆鐨勫叾瀹冩暟鎹�
+ //string鍒嗗壊杞瑂tring[]
+ string[] stepcode = Array.ConvertAll<string, string>(string.Join(",", json[0].children.Select(s => s.code)).Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString());
+ sql = @"delete TPrteStep_Price where materiel_code=@partcode and step_code not in @stepcode";
+ list.Add(new { str = sql, parm = new { partcode = json[0].partcode, stepcode = stepcode } });
}
}
bool aa = DapperHelper.DoTransaction(list);
@@ -1280,7 +1268,7 @@
//鑾峰彇鐗╂枡鏁版嵁
sql = @"select M.partcode,M.partname,M.partspec,M.idunit as uom_code,T.name as uom_name,
M.idunitgroup as stocktype_code,D.name as stocktype_name,
- M.idwarehouse as stck_code,S.name as stck_name
+ M.idwarehouse as stck_code,S.name as stck_name,M.default_route
from TMateriel_Info M
left join TUnit T on M.idunit=T.code
left join TUnitGroup D on M.idunitgroup=D.code
--
Gitblit v1.9.3