From 8fdbaa96f141543fe9f6210975734809a209a0c8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 六月 2024 15:03:16 +0800
Subject: [PATCH] 1.报工增加按序和不按序报工操作，工序调整增加按序和不按序报工调整 2.增加SOP管理：设备SOP管理、工艺SOP管理功能
---
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index cbc86af..e041246 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -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 TPrteEqp_Stad where materiel_code=@partcode and route_code not in @routecode";
+ list.Add(new { str = sql, parm = new { partcode = json[0].partcode, routecode= routcode } });
}
}
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 TPrteEqp_Stad 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