bug
liuying
2024-04-25 ae4e29f352975c2197521cf3c0b7179868d8cb84
bug
已修改4个文件
20 ■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
@@ -14,7 +14,7 @@
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入类型" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入类型ID!'}]}]" /> -->
          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['containerTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{
              item.typeName }}</a-select-option>
          </a-select>
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
@@ -93,7 +93,8 @@
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this),
      selectTypeData2:[]
      selectTypeData2:[],
      selectTypeData:[]
    }
  },
  created() {
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs
@@ -245,7 +245,7 @@
        /// <summary>
        /// 类型名称
        /// </summary>
        [Required(ErrorMessage = "类型名称不能为空")]
        public virtual string ContainerTypeName { get; set; }
        
        /// <summary>
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs
@@ -26,6 +26,7 @@
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly IRepository<WmsContainerType, MasterDbContextLocator> _wmsContainerTypeRep;
        private readonly static object _lock = new();
        public WmsContainerService(
@@ -33,12 +34,15 @@
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
            , IRepository<WmsContainerType, MasterDbContextLocator> wmsContainerTypeRep
        )
        {
            _wmsContainerRep = wmsContainerRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
            _wmsContainerTypeRep = wmsContainerTypeRep;
        }
        /// <summary>
@@ -164,9 +168,18 @@
        public async Task Add(AddWmsContainerInput input)
        {
            var wmsContainer = input.Adapt<WmsContainer>();
                        //验证
            await CheckExisit(wmsContainer);
            //容器类型id
            var ContainerTypeInfo = _wmsContainerTypeRep.Where(x => x.Id == input.ContainerTypeId).FirstOrDefault();
            if (ContainerTypeInfo == null)
            {
                throw Oops.Oh(errorMessage: @$"类型不存在!");
            }
            wmsContainer.ContainerTypeName = ContainerTypeInfo.TypeName;
            wmsContainer.CreatedUserId = wmsContainer.UpdatedUserId = SysHelper.GetUserId();
            wmsContainer.CreatedUserName = wmsContainer.UpdatedUserName = SysHelper.GetUserName();
            wmsContainer.CreatedTime = wmsContainer.UpdatedTime = SysHelper.GetNowTime();