bug

liuying

2024-04-25 087b06eb3550e65603a9fbfef9e24dbf4168a09e

bug

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue

@@ -32,7 +32,7 @@
        <a-form-item label="所属仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择所属仓库"
            v-decorator="['warehouseId', { rules: [{ required: true, message: '请选择所属仓库！' }] }]">
            <a-select-option v-for="(item, index) in warehouseIdData" :key="index" :value="item.code">{{ item.name
            <a-select-option v-for="(item, index) in warehouseIdData" :key="index" :value="item.id">{{ item.name
            }}</a-select-option>
          </a-select>
        </a-form-item>
@@ -104,7 +104,15 @@
    add(record) {
      this.visible = true
      this.$nextTick(() => {

        this.form.setFieldsValue({
          'isBarcodeLevelControl':false,
          'isFIFO':false,
          'isPartLevelControl':false,
          'isAllowConfusion':false,
          'isAllowNegativeInventory':false,
          'isVirtually':false,
          'isDisabled':false,
        })
      });
      // const warehouseIdOption = this.$options
      // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue

@@ -33,7 +33,8 @@
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="库区状态">
                  <a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear placeholder="请输入库区状态"/>
                                        <a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear
                                            placeholder="请输入库区状态" />
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
@@ -42,63 +43,79 @@
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="所属仓库">
                  <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId" placeholder="请选择所属仓库">
                    <a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId"
                                            placeholder="请选择所属仓库">
                                            <a-select-option v-for="(item, index) in warehouseIdData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
            <a-col :md="8" :sm="24">
                <a-form-item label="零件级管控">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isBarcodeLevelControl" placeholder="请选择零件级管控">
                        <a-select-option v-for="(item,index) in isBarcodeLevelControlData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%"
                                            v-model="queryParam.isBarcodeLevelControl" placeholder="请选择零件级管控">
                                            <a-select-option v-for="(item, index) in isBarcodeLevelControlData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="检验先进先出">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isFIFO" placeholder="请选择检验先进先出">
                        <a-select-option v-for="(item,index) in isFIFOData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isFIFO"
                                            placeholder="请选择检验先进先出">
                                            <a-select-option v-for="(item, index) in isFIFOData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="零件级管控">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isPartLevelControl" placeholder="请选择零件级管控">
                        <a-select-option v-for="(item,index) in isPartLevelControlData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%"
                                            v-model="queryParam.isPartLevelControl" placeholder="请选择零件级管控">
                                            <a-select-option v-for="(item, index) in isPartLevelControlData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="允许混淆">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isAllowConfusion" placeholder="请选择允许混淆">
                        <a-select-option v-for="(item,index) in isAllowConfusionData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%"
                                            v-model="queryParam.isAllowConfusion" placeholder="请选择允许混淆">
                                            <a-select-option v-for="(item, index) in isAllowConfusionData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="允许负库存">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isAllowNegativeInventory" placeholder="请选择允许负库存">
                        <a-select-option v-for="(item,index) in isAllowNegativeInventoryData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%"
                                            v-model="queryParam.isAllowNegativeInventory" placeholder="请选择允许负库存">
                                            <a-select-option v-for="(item, index) in isAllowNegativeInventoryData"
                                                :key="index" :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="是否虚拟">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isVirtually" placeholder="请选择是否虚拟">
                        <a-select-option v-for="(item,index) in isVirtuallyData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isVirtually"
                                            placeholder="请选择是否虚拟">
                                            <a-select-option v-for="(item, index) in isVirtuallyData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
        
            <a-col :md="8" :sm="24">
                <a-form-item label="是否禁用">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="请选择是否禁用">
                        <a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
                                            placeholder="请选择是否禁用">
                                            <a-select-option v-for="(item, index) in isDisabledData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
@@ -108,7 +125,10 @@
                <a-col :md="8" :sm="24">
                    <a-form-item label="创建时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>
                                            format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                                        }"
                                            v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
                                            format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />

                    </a-form-item>
                </a-col>
@@ -118,7 +138,10 @@
                <a-col :md="8" :sm="24">
                    <a-form-item label="更新时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>
                                            format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                                        }"
                                            v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
                                            format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />

                    </a-form-item>
                </a-col>
@@ -150,24 +173,21 @@
    </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{x: true,y:tableHeight}"
        :rowKey="(record) => record.id"
            <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
                :scroll="{ x: true, y: tableHeight }" :rowKey="(record) => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsArea:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
                        <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
                            @click="$refs.excelForm.index()">
            导入
          </a-button>
          <a-button type="info" v-if="hasPerm('WmsArea:exportExcel')" icon="download" @click="WmsAreaToExcel()">
                        <a-button type="info" v-if="hasPerm('WmsArea:exportExcel')" icon="download"
                            @click="WmsAreaToExcel()">
            导出
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus" @click="$refs.addForm.add()">新增库区信息</a-button>
                        <a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus"
                            @click="$refs.addForm.add()">新增库区信息</a-button>
        </div>
        </template>
          <span slot="warehouseIdscopedSlots" slot-scope="text">
@@ -240,7 +260,8 @@
            
            <a v-if="hasPerm('WmsArea:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsArea:edit') & hasPerm('WmsArea:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsArea:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsAreaDelete(record)">
                    <a-popconfirm v-if="hasPerm('WmsArea:delete')" placement="topRight" title="确认删除？"
                        @confirm="() => WmsAreaDelete(record)">
            <a>删除</a>
          </a-popconfirm>
        </span>
@@ -425,27 +446,27 @@
    sorter: true,
    dataIndex: 'erpCode'
    },
    {
    title: '所属仓库',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'warehouseId',
    scopedSlots: { customRender: 'warehouseIdscopedSlots' }
    },
                // {
                //     title: '所属仓库',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'warehouseId',
                //     scopedSlots: { customRender: 'warehouseIdscopedSlots' }
                // },
    {
    title: '零件级管控',
    align: 'center',
@@ -826,12 +847,10 @@
    }
    }
</script>
<style lang="less">
  .table-operator {
<style lang="less">.table-operator {
    margin-bottom: 18px;
  }

  button {
    margin-right: 8px;
  }

</style>
}</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue

@@ -6,7 +6,7 @@
        <a-form-item label="容器类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入容器类型ID" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器类型名称" v-decorator="['containerTypeId']">
          <a-select style="width: 100%" placeholder="请选择容器类型名称"  v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型名称！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
            }}</a-select-option>
          </a-select>
@@ -16,9 +16,7 @@
          <a-input placeholder="请输入容器类型名称" v-decorator="['containerTypeName', {rules: [{required: true, message: '请输入容器类型名称！'}]}]" />
        </a-form-item> -->
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入物料类型ID" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId']">
          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型名称！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
              item.materialTypeName }}</a-select-option>
          </a-select>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue

@@ -6,7 +6,7 @@
        <a-form-item label="容器类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入容器类型ID" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器类型名称" v-decorator="['containerTypeId']">
          <a-select style="width: 100%" placeholder="请选择容器类型名称"  v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型名称！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
            }}</a-select-option>
          </a-select>
@@ -16,9 +16,7 @@
          <a-input placeholder="请输入容器类型名称" v-decorator="['containerTypeName', {rules: [{required: true, message: '请输入容器类型名称！'}]}]" />
        </a-form-item> -->
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入物料类型ID" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId']">
          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型名称！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
              item.materialTypeName }}</a-select-option>
          </a-select>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs

@@ -223,13 +223,13 @@
        /// <summary>
        /// 仓库编号
        /// </summary>
        [Required(ErrorMessage = "仓库编号不能为空")]
        //[Required(ErrorMessage = "仓库编号不能为空")]
        public virtual string WarehouseCode { get; set; }
        
        /// <summary>
        /// 仓库名称
        /// </summary>
        [Required(ErrorMessage = "仓库名称不能为空")]
        //[Required(ErrorMessage = "仓库名称不能为空")]
        public virtual string WarehouseName { get; set; }
        
        /// <summary>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs

@@ -26,6 +26,8 @@
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly IRepository<WmsWarehouse, MasterDbContextLocator> _wmsWarehouseRep;

        private readonly static object _lock = new();

        public WmsAreaService(
@@ -33,12 +35,14 @@
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
            ,IRepository<WmsWarehouse, MasterDbContextLocator> wmsWarehouseRep
        )
        {
            _wmsAreaRep = wmsAreaRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
         _wmsWarehouseRep = wmsWarehouseRep; 
        }

        /// <summary>
@@ -163,7 +167,14 @@
            var wmsArea = input.Adapt<WmsArea>();
                        //验证
            await CheckExisit(wmsArea);

            //所属仓库
            var Info = _wmsWarehouseRep.Where(x => x.Id == input.WarehouseId).FirstOrDefault();
            if (Info == null)
            {
                throw Oops.Oh(errorMessage: @$"所属仓库不存在！");
            }
            wmsArea.WarehouseName = Info.Name;
            wmsArea.WarehouseCode = Info.Code;
            wmsArea.CreatedUserId = wmsArea.UpdatedUserId = SysHelper.GetUserId();
            wmsArea.CreatedUserName = wmsArea.UpdatedUserName = SysHelper.GetUserName();
            wmsArea.CreatedTime = wmsArea.UpdatedTime = SysHelper.GetNowTime();