From fa365d77dfa1d6619774a790e424e98dac849457 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 16:36:51 +0800
Subject: [PATCH] 修复bug
---
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/Service/PipeAccessoryAssembly.ts | 7 ++
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Controllers/PipeAccessoryAssembly.ts | 35 +++++++++++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 65 ++++++++++-----------
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/PipeAccessoryAssembly.ts | 9 +++
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx | 15 ++++
5 files changed, 94 insertions(+), 37 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Controllers/PipeAccessoryAssembly.ts b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Controllers/PipeAccessoryAssembly.ts
index a5a52e0..0b661fd 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Controllers/PipeAccessoryAssembly.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Controllers/PipeAccessoryAssembly.ts
@@ -176,6 +176,38 @@
}
})
}
+ //娉曞叞鍐茬爜瀹屽伐
+ const onFinishSendFlangeCode = () => {
+ const names = selection.value.map((item: { dataIdentifier: string }) => item.dataIdentifier)
+ if(names.length==0){
+ ElMessage.warning('璇烽�夋嫨涓�鏉¤褰�');
+ return;
+ }
+ if(names.length>1){
+ ElMessage.warning('璇峰彧鑳介�夋嫨涓�鏉¤褰�');
+ return;
+ }
+ ConfirmBox(
+ `鏄惁瑕佸畬宸ユ硶鍏板啿鐮�${names.length ? names.join(',') : ''}`
+ ).then(async () => {
+ // 鑾峰彇閫変腑鐨勭涓�鏉¤褰�
+ const selectedItem = selection.value[0];
+
+ // 鏋勫缓鍙傛暟瀵硅薄
+ const param = {
+ processName: selectedItem.processName || '', // 浠诲姟缂栧彿
+ PipeSpecCode: selectedItem.pipeSpecCode || '',// 绠℃缂栫爜
+ };
+
+ var ret= await PipeAccessoryAssembly.finishSendFlangeCode(param)
+ if(ret.code=="200"){
+ ElMessage.success('瀹屽伐娉曞叞鍐茬爜鎴愬姛')
+ tableRef.value.getList()
+ }else{
+ ElMessage.error('瀹屽伐娉曞叞鍐茬爜澶辫触:'+ret.message)
+ }
+ })
+ }
const onCheck = (records: any) => {
selection.value = records
}
@@ -305,6 +337,7 @@
onCheck,
onAddPipeAccessoryAssembly,
onAdvancedQuery,
- onSendFlangeCode
+ onSendFlangeCode,
+ onFinishSendFlangeCode
}
}
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/PipeAccessoryAssembly.ts b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/PipeAccessoryAssembly.ts
index 782861f..5391d9d 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/PipeAccessoryAssembly.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/PipeAccessoryAssembly.ts
@@ -3,6 +3,7 @@
// deletePipeAccessoryAssemblys,
// addPipeAccessoryAssembly,
sendFlangeCode,
+ finishSendFlangeCode,
cloneData,
} from './Service/PipeAccessoryAssembly'
@@ -29,6 +30,14 @@
async sendFlangeCode(data: Record<string, any>) {
return sendFlangeCode(data)
}
+ /**
+ * 瀹屽伐娉曞叞鍐茬爜
+ * @param id
+ * @returns
+ */
+ async finishSendFlangeCode(data: Record<string, any>) {
+ return finishSendFlangeCode(data)
+ }
/**
* 娣诲姞鏁版嵁
* @param data
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/Service/PipeAccessoryAssembly.ts b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/Service/PipeAccessoryAssembly.ts
index 581ae4a..146b40d 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/Service/PipeAccessoryAssembly.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Models/Service/PipeAccessoryAssembly.ts
@@ -84,4 +84,11 @@
*/
export const sendFlangeCode = (data: any) => {
return request.post('/api/v1/PipeLineLems/WorkPlanPublic/sendFlangeCode', data)
+}
+/**
+ * 瀹屽伐娉曞叞鍐茬爜
+ * @returns
+ */
+export const finishSendFlangeCode = (data: any) => {
+ return request.post('/api/v1/PipeLineLems/WorkPlanPublic/SendFlangeCode_FinishProduction', data)
}
\ No newline at end of file
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
index e34a429..02ba2e1 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
@@ -62,7 +62,8 @@
openDetail,
onSuccess,
onBeforeUpload,
- onSendFlangeCode
+ onSendFlangeCode,
+ onFinishSendFlangeCode
} = usePipeAccessoryAssembly(props, ctx)
// 鏌ヨ琛ㄥ崟鏁版嵁
@@ -206,6 +207,15 @@
return
}
onSendFlangeCode();
+ }
+ // 瀹屽伐娉曞叞鍐茬爜
+ const finishSendFlangeCode = () => {
+ console.log('鎵ц 瀹屽伐娉曞叞鍐茬爜')
+ if (queryForm.value.pipeSpecCode == '') {
+ ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
+ return
+ }
+ onFinishSendFlangeCode();
}
// 寮�宸ヤ簨浠跺鐞�
const startWork = () => {
@@ -556,6 +566,9 @@
<ElButton type="warning" onClick={sendFlangeCode}>
涓嬪彂娉曞叞鍐茬爜
</ElButton>
+ <ElButton type="warning" onClick={finishSendFlangeCode}>
+ 瀹屽伐娉曞叞鍐茬爜
+ </ElButton>
</div>
<RenderBaseTable
url={routeUrl.value}
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 e1754ac..de0504a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -18,6 +18,7 @@
using CMS.Plugin.ProductManagement.Abstractions;
using CMS.Plugin.TraceManagement.Abstractions;
using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using CMS.Unit.RuntimeValue.Models;
using CmsQueryExtensions;
using CmsQueryExtensions.Entitys;
using CmsQueryExtensions.Extension;
@@ -711,15 +712,16 @@
var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();
// 鏌ユ壘鏁版嵁
- var workTask = await workTaskRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode);
- if (workTask == null)
- {
- throw new UserFriendlyException($"鎵句笉鍒颁綔涓氳鍒�");
- }
+
var workPlan = await workPlanRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode);
if (workPlan == null)
{
throw new UserFriendlyException($"鎵句笉鍒颁綔涓氳鍒�");
+ }
+ var workTask = await workTaskRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode && x.ProcessName == workPlan.ProcessName);
+ if (workTask == null)
+ {
+ throw new UserFriendlyException($"鎵句笉鍒颁綔涓氫换鍔�");
}
if (workPlan.ProcessName == "瑁呴厤宸ュ簭")
{
@@ -997,21 +999,20 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1034,22 +1035,19 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
- }
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
-
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
_value = "15mm";
@@ -1071,7 +1069,7 @@
await traceProvider.CreateTraceAsync(traceModel);
-
+
#endregion
@@ -1413,21 +1411,20 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1450,26 +1447,24 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
if (item.Name == $"{processName}鍐呭")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍐呭");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍐呭");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1492,7 +1487,7 @@
await traceProvider.CreateTraceAsync(traceModel);
-
+
#endregion
--
Gitblit v1.9.3