调整

payne

2024-04-24 f4d2c032c91e459ee8775ba88870478be3e76261

调整

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

@@ -17,17 +17,18 @@
        <a-form-item label="库位别名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库位别名" v-decorator="['placeAlias']" />
        </a-form-item>
        <a-form-item label="库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入库位类型" style="width: 100%" v-decorator="['placeType', {rules: [{required: true, message: '请输入库位类型！'}]}]" />
        <a-form-item label="库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择库位类型" v-decorator="['placeType', {rules: [{ required: true, message: '请选择库位类型！' }]}]">
            <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="库位类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库位类型名称" v-decorator="['placeTypeName']" />
        </a-form-item>
        <a-form-item label="存放单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入存放单位" v-decorator="['stockUnit']" />
        </a-form-item>
        <a-form-item label="库位属性" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入库位属性" style="width: 100%" v-decorator="['placeStatus']" />
        <a-form-item label="库位属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择库位属性" v-decorator="['placeStatus', {rules: [{ required: true, message: '请选择库位属性！' }]}]">
            <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="是否堆垛机库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
@@ -137,6 +138,8 @@
  xs: { span: 24 },
  sm: { span: 15 }
  },
  placeTypeData: [],
  placeStatusData: [],
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
@@ -150,6 +153,10 @@
        this.$nextTick(() => {

        });
        const placeTypeOption = this.$options
        this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
        const placeStatusOption = this.$options
        this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
      },
      /**
       * 提交表单

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

@@ -17,17 +17,18 @@
        <a-form-item label="库位别名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库位别名" v-decorator="['placeAlias']" />
        </a-form-item>
        <a-form-item label="库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入库位类型" style="width: 100%" v-decorator="['placeType', {rules: [{required: true, message: '请输入库位类型！'}]}]" />
        <a-form-item label="库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择库位类型" v-decorator="['placeType', {rules: [{ required: true, message: '请选择库位类型！' }]}]">
            <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="库位类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库位类型名称" v-decorator="['placeTypeName']" />
        </a-form-item>
        <a-form-item label="存放单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入存放单位" v-decorator="['stockUnit']" />
        </a-form-item>
        <a-form-item label="库位属性" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入库位属性" style="width: 100%" v-decorator="['placeStatus']" />
        <a-form-item label="库位属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择库位属性" v-decorator="['placeStatus', {rules: [{ required: true, message: '请选择库位属性！' }]}]">
            <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="是否堆垛机库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
@@ -140,6 +141,8 @@
  sm: { span: 15 }
  },
  record: {},
  placeTypeData: [],
  placeStatusData: [],
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
@@ -155,6 +158,10 @@
        });
        //深度拷贝 移除VUE的监听，防止INDEX页面值变动
        this.record = JSON.parse(JSON.stringify(record))
        const placeTypeOption = this.$options
        this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
        const placeStatusOption = this.$options
        this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
        this.$nextTick(() => {
          this.form.setFieldsValue(
            {
@@ -164,7 +171,6 @@
              placeAlias: record.placeAlias,
              placeType: record.placeType,
              placeTypeName: record.placeTypeName,
              stockUnit: record.stockUnit,
              placeStatus: record.placeStatus,
              isSrmPlace: record.isSrmPlace,
              srmPlaceNo: record.srmPlaceNo,

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

@@ -22,21 +22,20 @@
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="库位类型">
                  <a-input-number v-model="queryParam.placeType" style="width: 100%" allow-clear placeholder="请输入库位类型"/>
                  <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeType" placeholder="请选择库位类型">
                    <a-select-option v-for="(item,index) in placeTypeData" :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-input v-model="queryParam.placeTypeName" allow-clear placeholder="请输入库位类型名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="存放单位">
                  <a-input v-model="queryParam.stockUnit" allow-clear placeholder="请输入存放单位"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="库位属性">
                  <a-input-number v-model="queryParam.placeStatus" style="width: 100%" allow-clear placeholder="请输入库位属性"/>
                  <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeStatus" placeholder="请选择库位属性">
                    <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
            <a-col :md="8" :sm="24">
@@ -218,17 +217,7 @@

                    </a-form-item>
                </a-col>
			
              <a-col :md="8" :sm="24">
                <a-form-item label="创建者名称">
                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="修改者名称">
                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称"/>
                </a-form-item>
              </a-col>    </template>
                </template>

            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">
@@ -266,6 +255,12 @@
            <a-button type="primary" v-if="hasPerm('WmsPlace:add')" icon="plus" @click="$refs.addForm.add()">新增库位信息</a-button>
        </div>
        </template>
          <span slot="placeTypescopedSlots" slot-scope="text">
            {{ 'place_type' | dictType(text) }}
            </span>
          <span slot="placeStatusscopedSlots" slot-scope="text">
            {{ 'place_status' | dictType(text) }}
            </span>
          <span slot="isSrmPlacescopedSlots" slot-scope="text">
            <div v-if="text===true ">
                <a-tag color="green">是</a-tag>
@@ -444,19 +439,20 @@
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '80px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '80px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'placeType'
    dataIndex: 'placeType',
    scopedSlots: { customRender: 'placeTypescopedSlots' }
    },
    {
    title: '库位类型名称',
@@ -479,44 +475,25 @@
    dataIndex: 'placeTypeName'
    },
    {
    title: '存放单位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'stockUnit'
    },
    {
    title: '库位属性',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '80px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '80px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'placeStatus'
    dataIndex: 'placeStatus',
    scopedSlots: { customRender: 'placeStatusscopedSlots' }
    },
    {
    title: '是否堆垛机库位',
@@ -1193,6 +1170,8 @@
    return res.data
    })
    },
        placeTypeData: [],
        placeStatusData: [],
    selectedRowKeys: [],
    selectedRows: []
    }
@@ -1219,6 +1198,10 @@
    }
    });
    }
    const placeTypeOption = this.$options
    this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
    const placeStatusOption = this.$options
    this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
    const isSrmPlaceOption = this.$options
    this.isSrmPlaceData = isSrmPlaceOption.filters['dictData']('yes_true_false')
    const isRgvPlaceOption = this.$options

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs

@@ -63,7 +63,7 @@
                                     .Where(input.MaterialType != null, u => u.MaterialType == input.MaterialType)
                                     .Where(!string.IsNullOrEmpty(input.MaterialGroup), u => u.MaterialGroup == input.MaterialGroup)
                                     .Where(!string.IsNullOrEmpty(input.ABCClassName), u => u.ABCClassName == input.ABCClassName)
                                     .Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
                                     //.Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
                                     .Where(!string.IsNullOrEmpty(input.MaterialSpec), u => u.MaterialSpec == input.MaterialSpec)
                                     .Where(!string.IsNullOrEmpty(input.InPlaceCode), u => u.InPlaceCode == input.InPlaceCode)
                                     .Where(!string.IsNullOrEmpty(input.MaterialUnit), u => u.MaterialUnit == input.MaterialUnit)
@@ -128,7 +128,7 @@
                .Where(pMaterialType != null, u => u.MaterialType == pMaterialType)
                .Where(!string.IsNullOrEmpty(pMaterialGroup), u => u.MaterialGroup == pMaterialGroup)
                .Where(!string.IsNullOrEmpty(pABCClassName), u => u.ABCClassName == pABCClassName)
                .Where(pABCClass != null, u => u.ABCClass == pABCClass)
                //.Where(pABCClass != null, u => u.ABCClass == pABCClass)
                .Where(!string.IsNullOrEmpty(pMaterialSpec), u => u.MaterialSpec == pMaterialSpec)
                .Where(!string.IsNullOrEmpty(pInPlaceCode), u => u.InPlaceCode == pInPlaceCode)
                .Where(!string.IsNullOrEmpty(pMaterialUnit), u => u.MaterialUnit == pMaterialUnit)
@@ -441,7 +441,7 @@
                              }
                              else
                              {
                                 addItem.ABCClass = outABCClass;
                                // addItem.ABCClass = outABCClass;
                              }
                          
                          }

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs

@@ -91,7 +91,7 @@
        /// </summary>
        [Comment("ABC分类")]

        public int? ABCClass { get; set; }
        public ABCClassEnum? ABCClass { get; set; }


        /// <summary>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs

@@ -139,4 +139,28 @@
        [Description("T")]
        T = 2
    }

    /// <summary>
    /// 物料ABC分类
    /// </summary>
    public enum ABCClassEnum
    {
        /// <summary>
        /// A
        /// </summary>
        [Description("A")]
        A = 1,

        /// <summary>
        ///B
        /// </summary>
        [Description("B")]
        B= 2,

        /// <summary>
        ///C
        /// </summary>
        [Description("C")]
        C = 3
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -260,6 +260,10 @@
                new SysDictData{Id=539733729484869, TypeId=539731668947013, Value="基础库位", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=539733806522437, TypeId=539731668947013, Value="组合库位", Code="3", Sort=100, Remark="", Status=0 },

                new SysDictData{Id=539751848640581, TypeId=539751788187717, Value="A", Code="1", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=539751869472837, TypeId=539751788187717, Value="B", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=539751888134213, TypeId=539751788187717, Value="C", Code="3", Sort=100, Remark="", Status=0 },

            };
        }
    }

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs

@@ -79,8 +79,8 @@
                new SysDictType{Id=386522984120391, Name="单据明细表状态", Code="orderdetails_statusenum", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=386522984120392, Name="单据大类", Code="orderlargecategory_Enum", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=386522984120393, Name="单据主表状态", Code="order_statusenum", Sort=100, Remark="", Status=0 },
               

                  new SysDictType{Id=539751788187717, Name="物料ABC分类", Code="order_statusenum", Sort=100, Remark="", Status=0 },
            };
        }
    }

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx

Binary files differ