Qubot/EasyMES
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化bom结构保存和删除工序

Browse Source
This commit is contained in:
12888491 2022-11-22 15:51:57 +08:00
parent 5a72b3bda9
commit ce51c48b9b
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WaterCloud.Service/MaterialManage/BomInfoService.cs
View File

@ -67,10 +67,13 @@ namespace WaterCloud.Service.MaterialManage
public async Task SubmitForm(BomFormEntity entity, string listData)
{
uniwork.BeginTrans();
await repository.Delete(a => a.F_BomType == 1 && a.F_MaterialId == entity.F_MaterialId && a.F_ProcessId == entity.F_ProcessId);
if (await uniwork.IQueryable<MaterialEntity>(a => a.F_Id == entity.F_MaterialId && a.F_MaterialType == 0).AnyAsync())
throw new Exception("原料不能有bom构成");
if (!string.IsNullOrEmpty(listData))
{
var list = listData.ToList<BomFormEntity>();
if (list.Any(a=>a.F_SonMaterialId == a.F_MaterialId))
throw new Exception("bom构物料异常");
foreach (var item in list)
{
item.Create();
@ -79,12 +82,15 @@ namespace WaterCloud.Service.MaterialManage
item.F_DeleteMark = false;
item.F_BomType = 1;
}
await repository.Delete(a => a.F_BomType == 1 && a.F_MaterialId == entity.F_MaterialId && a.F_ProcessId == entity.F_ProcessId);
await repository.Insert(list);
}
uniwork.Commit();
}
public async Task DeleteForm(string itemId, string keyValue)
{
if (string.IsNullOrEmpty(keyValue))
await repository.Delete(a => a.F_BomType == 1 && a.F_MaterialId == itemId);
await repository.Delete(a => a.F_BomType == 1 && a.F_MaterialId == itemId && a.F_ProcessId == keyValue);
}
#endregion

2
database/mysql(带数据).sql
View File

@ -4563,5 +4563,7 @@ CREATE TABLE `sys_userlogon` (
INSERT INTO `sys_userlogon` VALUES ('08d96e82-89ea-4ed8-89fb-9520423dbcf7', '08d96e82-89ea-4ed8-89fb-9520423dbcf7', '107b8ef72a5ee9b734d89c8617fa4c1c', '1eacb75a6c6118fd', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO `sys_userlogon` VALUES ('08dab311-971f-40e5-8f63-83a1e1b16a44', '08dab311-971f-40e5-8f63-83a1e1b16a44', 'f8bf369a1f87f62355e5f9ecd9f83c85', '9c44480ef4a92f2f', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0);
INSERT INTO `sys_userlogon` VALUES ('9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '52c6b3f2456d7a6e4ce848c38bb0a228', 'b648e3d3de301b49', NULL, NULL, NULL, NULL, NULL, '2020-04-17 14:47:44', '2020-04-17 14:59:58', NULL, 0, 360, 0, NULL, NULL, 0, NULL, NULL, 'evrcyibdv42f3ykhfy1yz3ur', 0);
INSERT INTO `sys_modulebutton` VALUES ('08d9a4b8-24a5-4b3e-8682-169a9ab29c05', '39226710-b665-489e-aaa0-a8c15d29ed4c', '0', 1, 'NF-delete', '删除', NULL, 1, 'delete', '/MaterialManage/BomInfo/DeleteForm', NULL, 0, 0, 0, 1, 0, 1, '', '2021-11-11 10:08:25', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, '');
SET FOREIGN_KEY_CHECKS = 1;

1
database/mysql.sql
View File

@ -3435,5 +3435,6 @@ CREATE TABLE `sys_userlogon` (
-- Records of sys_userlogon
-- ----------------------------
INSERT INTO `sys_userlogon` VALUES ('9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '52c6b3f2456d7a6e4ce848c38bb0a228', 'b648e3d3de301b49', NULL, NULL, NULL, NULL, NULL, '2020-04-17 14:47:44', '2020-04-17 14:59:58', NULL, 0, 360, 0, NULL, NULL, 0, NULL, NULL, 'evrcyibdv42f3ykhfy1yz3ur', 0);
INSERT INTO `sys_modulebutton` VALUES ('08d9a4b8-24a5-4b3e-8682-169a9ab29c05', '39226710-b665-489e-aaa0-a8c15d29ed4c', '0', 1, 'NF-delete', '删除', NULL, 1, 'delete', '/MaterialManage/BomInfo/DeleteForm', NULL, 0, 0, 0, 1, 0, 1, '', '2021-11-11 10:08:25', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, '');
SET FOREIGN_KEY_CHECKS = 1;

3
database/sqlserver(带数据).sql
View File

@ -16045,3 +16045,6 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW
ON [PRIMARY]
GO
INSERT INTO [dbo].[sys_ModuleButton] ([F_Id], [F_ModuleId], [F_ParentId], [F_Layers], [F_EnCode], [F_FullName], [F_Icon], [F_Location], [F_JsEvent], [F_UrlAddress], [F_Split], [F_IsPublic], [F_AllowEdit], [F_AllowDelete], [F_SortCode], [F_DeleteMark], [F_EnabledMark], [F_Description], [F_CreatorTime], [F_CreatorUserId], [F_LastModifyTime], [F_LastModifyUserId], [F_DeleteTime], [F_DeleteUserId], [F_Authorize]) VALUES (N'08d9a4b8-24a5-4b3e-8682-169a9ab29c05', N'39226710-b665-489e-aaa0-a8c15d29ed4c', N'0', N'1', N'NF-delete', N'删除', NULL, N'1', N'delete', N'/MaterialManage/BomInfo/DeleteForm', NULL, N'0', N'0', N'0', N'2', N'0', N'1', N'', N'2021-11-11 10:08:25.0000000', N'9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, N'')
GO

2
database/sqlserver.sql
View File

@ -12587,3 +12587,5 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW
ON [PRIMARY]
GO
INSERT INTO [dbo].[sys_ModuleButton] ([F_Id], [F_ModuleId], [F_ParentId], [F_Layers], [F_EnCode], [F_FullName], [F_Icon], [F_Location], [F_JsEvent], [F_UrlAddress], [F_Split], [F_IsPublic], [F_AllowEdit], [F_AllowDelete], [F_SortCode], [F_DeleteMark], [F_EnabledMark], [F_Description], [F_CreatorTime], [F_CreatorUserId], [F_LastModifyTime], [F_LastModifyUserId], [F_DeleteTime], [F_DeleteUserId], [F_Authorize]) VALUES (N'08d9a4b8-24a5-4b3e-8682-169a9ab29c05', N'39226710-b665-489e-aaa0-a8c15d29ed4c', N'0', N'1', N'NF-delete', N'删除', NULL, N'1', N'delete', N'/MaterialManage/BomInfo/DeleteForm', NULL, N'0', N'0', N'0', N'2', N'0', N'1', N'', N'2021-11-11 10:08:25.0000000', N'9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, N'')
GO