22

schangxiang@126.com

2025-05-12 a32d829058604ce4119202dd4c93614819cf637b

22

 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" 

 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" 

 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)', 

 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" 

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/CallMaterialOrder/CallMaterialOrderCreateOrUpdateDtoBase.cs

@@ -30,6 +30,11 @@
        public int Quantity { get; set; }

        /// <summary>
    /// 创建人
    /// </summary>
    public string CreatorName { get; set; }

    /// <summary>
        /// WMS返回结果
        /// </summary>
        public string? WmsRetResult { get; set; }

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


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