From 0025d492f22acf84f6db722381b4a54893f6ef29 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 19 5月 2025 18:03:30 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 8 +++++---
PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Controllers/CallMaterialOrder.ts | 10 +++++++---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs | 5 +++++
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 1 +
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs | 1 +
5 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
index 15338d0..2c444c7 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
@@ -117,6 +117,7 @@
{
try
{
+ input.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
var list = await _wmsmaterialstockAppService.FindListByFilterAsync(input);
return new CmsApiResponse<List<WmsMaterialStockDto>>()
{
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Controllers/CallMaterialOrder.ts b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Controllers/CallMaterialOrder.ts
index 6d31ed6..062cb6c 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Controllers/CallMaterialOrder.ts
+++ b/PipeLineLems/pipelinelems_web/src/widgets/CallMaterialOrder/Controllers/CallMaterialOrder.ts
@@ -160,11 +160,15 @@
`鏄惁瑕佸彨鏂�${names.length ? names.join(',') : ''}`
).then(async () => {
const ids = selection.value.map((item: { id: string }) => item.id)
- await callMaterialOrder.callMaterialByDataIdentifier({
+ var ret= await callMaterialOrder.callMaterialByDataIdentifier({
id:ids[0]
})
- ElMessage.success('鍙枡鎴愬姛')
- tableRef.value.getList()
+ if(ret.code=="200"){
+ ElMessage.success('鍙枡鎴愬姛')
+ tableRef.value.getList()
+ }else{
+ ElMessage.error('鍙枡澶辫触:'+ret.message)
+ }
})
}
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
index cbbf00e..a7fd24b 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
@@ -156,6 +156,7 @@
).then(async () => {
//鎮ㄧ殑涓氬姟閫昏緫
const param={
+ taskCode:queryForm.value.taskCode,
pipeSpecCode:queryForm.value.pipeSpecCode,
continerNo:queryForm.value.continerNo,
placeNo:queryForm.value.placeNo
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
index eaff4d9..802bf28 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
@@ -14,6 +14,11 @@
{
/// <summary>
+ /// 浠诲姟缂栧彿
+ /// </summary>
+ public string TaskCode { get; set; }
+
+ /// <summary>
/// 绠℃缂栫爜
/// </summary>
public string PipeSpecCode { get; set; }
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 7f09104..7b61b13 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -42,6 +42,10 @@
/// <returns></returns>
public async Task<MesOrderResponse> CommonPick(IServiceProvider _serviceProvider, PickInput input, MyCurrentUser myCurrentUser)
{
+ if (string.IsNullOrEmpty(input.TaskCode))
+ {
+ throw new UserFriendlyException("璇疯緭鍏ヤ换鍔＄紪鍙�");
+ };
if (string.IsNullOrEmpty(input.PipeSpecCode))
{
throw new UserFriendlyException("璇疯緭鍏ョ娈电紪鐮�");
@@ -103,9 +107,7 @@
});
}
//鐗╂枡鍙傛暟鍒楄〃
- var firstWorkPlans = await workPlanAppService.GetListByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
-
- var firstWorkPlan = await workPlanAppService.GetSingleByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
+ var firstWorkPlan = await workPlanAppService.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode);
var callMaterialOrder = await callMaterialOrderAppService.GetSingleByFilterAsync(x => x.DataIdentifier == firstWorkPlan.DataIdentifier);
//TODO:杩欓噷璋冪敤wms鐨勫彨鏂欐帴鍙�
try
--
Gitblit v1.9.3