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

zs

2025-05-14 0e5c33e776e68700dbe443cd453dd844b125a2fc

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

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs

@@ -92,23 +92,52 @@
        var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("分拣原料管标识");
        var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("分拣原料管型号");
        List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
        foreach (var item in workSection.MaterialParameters)
        {
            if (item.Name == "分拣原料管型号")
            {
        _MaterialParams.Add(new TraceMaterialModel()
        {
            Key = "分拣原料管标识",
                    Key = item.Key,
                    Quantity = 1,
                    MaterialId = rawPipe_MaterialMode.MaterialId,
                    MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
                    Value = firstWorkPlan.MaterialMode

                });
            }
            if (item.Name == "分拣原料管标识")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
                    Key = item.Key,
            Quantity = 1,
            MaterialId = rawPipe_DataIdentifier.MaterialId,
            MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
            Value = firstWorkPlan.DataIdentifier,

        });
        _MaterialParams.Add(new TraceMaterialModel()
            }
        };

        //配置过程参数(采集参数、配方参数)
        traceModel.Params = new List<TraceParamModel>();
        foreach (var item in workSection.ProcessParameters)
        {
            Key = "分拣原料管型号",
            Quantity = 1,
            MaterialId = rawPipe_MaterialMode.MaterialId,
            MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
            Value = firstWorkPlan.MaterialMode
        });
            string _value = "";
            if (item.Name == "分拣方向")
            {
                _value = "短管装配";
            }
            //item.Key
            TraceParamModel traceParamModel = new TraceParamModel()
            {
                Key = item.Key,
                Value = _value
            };
            traceModel.Params.Add(traceParamModel);
        };

        traceModel.MaterialParams = _MaterialParams;

        await traceProvider.CreateTraceAsync(traceModel);

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/ControllerÄ£°å.txt

@@ -67,7 +67,7 @@
        /// </summary>
        /// <param name="input">创建参数</param>
        /// <returns></returns>
        //[Authorize]
        [Authorize]
        [HttpPost]
        public virtual Task<$EntityName$Dto> CreateAsync($EntityName$CreateDto input)
        {
@@ -81,7 +81,7 @@
        /// <param name="id">主键ID</param>
        /// <param name="input">更新参数</param>
        /// <returns></returns>
        //[Authorize]
        [Authorize]
        [HttpPut]
        [Route("{id}")]
        public virtual Task<$EntityName$Dto> UpdateAsync(Guid id, $EntityName$UpdateDto input)
@@ -95,7 +95,7 @@
        /// </summary>
        /// <param name="ids">Id集合</param>
        /// <returns></returns>
        //[Authorize]
        [Authorize]
        [HttpPost]
        [Route("Clone")]
        public virtual Task<List<$EntityName$Dto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -113,7 +113,7 @@
        /// </summary>
        /// <param name="id">主键ID</param>
        /// <returns></returns>
        //[Authorize]
        [Authorize]
        [HttpDelete]
        [Route("{id}")]
        public virtual Task DeleteAsync(Guid id)
@@ -132,7 +132,7 @@
        /// </summary>
        /// <param name="ids">主键ID集合</param>
        /// <returns></returns>
        //[Authorize]
        [Authorize]
        [HttpDelete]
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
        {

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs

@@ -81,7 +81,7 @@
        /// <param name="id">主键ID</param> 
        /// <param name="input">更新参数</param> 
        /// <returns></returns> 
        //[Authorize] 
        [Authorize]
        [HttpPut] 
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)