From a32d829058604ce4119202dd4c93614819cf637b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 15:48:45 +0800
Subject: [PATCH] 22
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 2 +
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx | 4 +-
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts | 32 ++++++++-------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs | 13 ++++--
PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx | 8 ++--
PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx | 4 +-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs | 20 +++++++--
7 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx
index 4ee6337..acc6a18 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Views/Pages/CallMaterialOrder/CallMaterialOrder.tsx
@@ -297,7 +297,7 @@
鍙枡
</IconButton>
<el-divider direction="vertical" />
- <el-upload
+ {/* <el-upload
v-permission="callMaterialOrder-import"
name="file"
accept=".xlsx,.xls,.csv"
@@ -309,7 +309,7 @@
action="/api/v1/PipeLineLems/callMaterialOrder/import"
>
<IconButton icon="in">瀵煎叆</IconButton>
- </el-upload>
+ </el-upload> */}
<IconButton
v-permission="callMaterialOrder-output"
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
index 540bcd8..ed77a29 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrderRecord/Views/Pages/CallMaterialOrderRecord/CallMaterialOrderRecord.tsx
@@ -271,7 +271,7 @@
<div class={styles.headerContent}>
<div class={styles.header}>
- <IconButton
+ {/* <IconButton
v-permission="callMaterialOrderRecord-add"
icon="add-p"
onClick={onAddCallMaterialOrderRecord}
@@ -281,8 +281,8 @@
</IconButton>
<el-divider direction="vertical" />
- <el-divider direction="vertical" />
- <el-upload
+ <el-divider direction="vertical" /> */}
+ {/* <el-upload
v-permission="callMaterialOrderRecord-import"
name="file"
accept=".xlsx,.xls,.csv"
@@ -294,7 +294,7 @@
action="/api/v1/PipeLineLems/callMaterialOrderRecord/import"
>
<IconButton icon="in">瀵煎叆</IconButton>
- </el-upload>
+ </el-upload> */}
<IconButton
v-permission="callMaterialOrderRecord-output"
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
index e26a8f8..bb7c427 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/Config.ts
@@ -10,6 +10,21 @@
width:160,
},
{
+ field: 'processName',
+ title: '宸ュ簭鍚嶇О',
+ width:160,
+},
+{
+ field: 'pipeSpecCode',
+ title: '绠℃缂栫爜',
+ width:160,
+},
+{
+ field: 'pipeSectionName',
+ title: '绠℃鍚嶇О',
+ width:160,
+},
+{
field: 'workPlanStatusDesc',
title: '璁″垝鐘舵��',
width:160,
@@ -109,11 +124,7 @@
title: '宸ヤ欢鍚嶇О',
width:160,
},
-{
- field: 'processName',
- title: '宸ュ簭鍚嶇О',
- width:160,
-},
+
{
field: 'pipeFittingCode',
title: '绠′欢缂栫爜',
@@ -124,16 +135,7 @@
title: '椤哄簭鍙�',
width:160,
},
-{
- field: 'pipeSpecCode',
- title: '绠℃缂栫爜',
- width:160,
-},
-{
- field: 'pipeSectionName',
- title: '绠℃鍚嶇О',
- width:160,
-},
+
{
field: 'outerDiameter',
title: '澶栧緞(mm)',
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
index 6f745cc..e9598e6 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
@@ -304,7 +304,7 @@
<div class={styles.headerContent}>
<div class={styles.header}>
- <IconButton
+ {/* <IconButton
v-permission="workPlan-add"
icon="add-p"
onClick={onAddWorkPlan}
@@ -313,7 +313,7 @@
娣诲姞
</IconButton>
- <el-divider direction="vertical" />
+ <el-divider direction="vertical" /> */}
<el-upload
v-permission="workPlan-import"
name="file"
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs
index 9eb5224..50e4529 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs
@@ -29,10 +29,15 @@
/// </summary>
public int Quantity { get; set; }
- /// <summary>
- /// WMS杩斿洖缁撴灉
- /// </summary>
- public string? WmsRetResult { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string CreatorName { get; set; }
+
+ /// <summary>
+ /// WMS杩斿洖缁撴灉
+ /// </summary>
+ public string? WmsRetResult { get; set; }
/// <summary>
/// WMS浠诲姟鍙�
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index 5a25ab4..7211e3f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -212,6 +212,7 @@
CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鏈墽琛�,
DataIdentifier = gTask.Key,
MaterialMode = gTask.ToList().First().MaterialMode,
+ CreatorName = userAccount,
Quantity = 1
};
@@ -230,6 +231,7 @@
insertObj.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.鏈敓浜�;
insertObj.Sort = 1;
insertObj.CreatorName = userAccount;
+ insertObj.Remark = "绯荤粺瀵煎叆";
await workPlanAppService.CreateAsync(insertObj);
}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
index b9c5024..ed7599c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
@@ -450,12 +450,14 @@
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
+
//鏇存柊涓虹敓浜т腑
- foreach (var item in workPlanList)
+ var new_workPlanList = workPlanList.Where(x => x.ProcessRouteNumber == "鍒囧壊").ToList();
+ foreach (var item in new_workPlanList)
{
item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.鐢熶骇涓�;
}
- await workPlanRepository.UpdateManyAsync(workPlanList);
+ await workPlanRepository.UpdateManyAsync(new_workPlanList);
uow.CompleteAsync();
@@ -705,14 +707,22 @@
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
+ var new_workPlanList = workPlanList.Where(x => x.ProcessRouteNumber == "瑁呴厤").ToList();
//鏇存柊涓虹敓浜т腑
- foreach (var item in workPlanList)
+ foreach (var item in new_workPlanList)
{
item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.鐢熶骇涓�;
+ item.Remark = "鏇存柊鐢熶骇涓�";
}
- await workPlanRepository.UpdateManyAsync(workPlanList);
+ await workPlanRepository.UpdateManyAsync(new_workPlanList);
-
+ var new_workPlanList_printCode = workPlanList.Where(x => x.ProcessRouteNumber == "鍒囧壊").ToList();
+ foreach (var item in new_workPlanList_printCode)
+ {
+ item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.宸插畬鎴�;
+ item.Remark = "鏇存柊宸插畬鎴�";
+ }
+ await workPlanRepository.UpdateManyAsync(new_workPlanList_printCode);
uow.CompleteAsync();
--
Gitblit v1.9.3