Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-19 0025d492f22acf84f6db722381b4a54893f6ef29

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

 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>>()
                {

 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]
      }) 
      if(ret.code=="200"){
      ElMessage.success('叫料成功') 
      tableRef.value.getList() 
      }else{
        ElMessage.error('叫料失败:'+ret.message) 
      }
    }) 
  } 
 

 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

 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; }

 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