控制属性规则明细调整

payne

2024-04-24 751a8ee4490aaeab911f5e1ff60bbba40c104613

控制属性规则明细调整

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

@@ -8,32 +8,32 @@
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
        <a-form :form="form">
        <a-form-item label="控制属性规则ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则ID" v-decorator="['controlRuleId', {rules: [{required: true, message: '请输入控制属性规则ID！'}]}]" />
        <a-form-item label="控制属性规则编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入控制属性规则编号！'}]}]" />
        </a-form-item>
        <a-form-item label="最高库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最高库存" v-decorator="['maxImumqty', {rules: [{required: true, message: '请输入最高库存！'}]}]" />
          <a-input placeholder="请输入最高库存" v-decorator="['maxImumqty']" />
        </a-form-item>
        <a-form-item label="最低库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最低库存" v-decorator="['minImumqty', {rules: [{required: true, message: '请输入最低库存！'}]}]" />
          <a-input placeholder="请输入最低库存" v-decorator="['minImumqty']" />
        </a-form-item>
        <a-form-item label="安全库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入安全库存" v-decorator="['safeImumqty', {rules: [{required: true, message: '请输入安全库存！'}]}]" />
          <a-input placeholder="请输入安全库存" v-decorator="['safeImumqty']" />
        </a-form-item>
        <a-form-item label="最小库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最小库龄" v-decorator="['minStorageAge', {rules: [{required: true, message: '请输入最小库龄！'}]}]" />
          <a-input placeholder="请输入最小库龄" v-decorator="['minStorageAge']" />
        </a-form-item>
        <a-form-item label="最大库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最大库龄" v-decorator="['maxStorageAge', {rules: [{required: true, message: '请输入最大库龄！'}]}]" />
          <a-input placeholder="请输入最大库龄" v-decorator="['maxStorageAge']" />
        </a-form-item>
        <a-form-item label="是否免检" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isNotChek',{rules: [{ required: true, message: '请选择是否免检！' }], valuePropName: 'checked'}]" />
          <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="保质期天数" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入保质期天数" v-decorator="['shelfLifeDays', {rules: [{required: true, message: '请输入保质期天数！'}]}]" />
          <a-input placeholder="请输入保质期天数" v-decorator="['shelfLifeDays']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '请选择是否禁用！' }], valuePropName: 'checked'}]" />
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
      </a-form>
    </a-spin>

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

@@ -8,32 +8,32 @@
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-form-item label="控制属性规则ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则ID" v-decorator="['controlRuleId', {rules: [{required: true, message: '请输入控制属性规则ID！'}]}]" />
        <a-form-item label="控制属性规则编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入控制属性规则编号！'}]}]" />
        </a-form-item>
        <a-form-item label="最高库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最高库存" v-decorator="['maxImumqty', {rules: [{required: true, message: '请输入最高库存！'}]}]" />
          <a-input placeholder="请输入最高库存" v-decorator="['maxImumqty']" />
        </a-form-item>
        <a-form-item label="最低库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最低库存" v-decorator="['minImumqty', {rules: [{required: true, message: '请输入最低库存！'}]}]" />
          <a-input placeholder="请输入最低库存" v-decorator="['minImumqty']" />
        </a-form-item>
        <a-form-item label="安全库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入安全库存" v-decorator="['safeImumqty', {rules: [{required: true, message: '请输入安全库存！'}]}]" />
          <a-input placeholder="请输入安全库存" v-decorator="['safeImumqty']" />
        </a-form-item>
        <a-form-item label="最小库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最小库龄" v-decorator="['minStorageAge', {rules: [{required: true, message: '请输入最小库龄！'}]}]" />
          <a-input placeholder="请输入最小库龄" v-decorator="['minStorageAge']" />
        </a-form-item>
        <a-form-item label="最大库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入最大库龄" v-decorator="['maxStorageAge', {rules: [{required: true, message: '请输入最大库龄！'}]}]" />
          <a-input placeholder="请输入最大库龄" v-decorator="['maxStorageAge']" />
        </a-form-item>
        <a-form-item label="是否免检" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isNotChek',{rules: [{ required: true, message: '请选择是否免检！' }], valuePropName: 'checked'}]" />
          <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="保质期天数" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入保质期天数" v-decorator="['shelfLifeDays', {rules: [{required: true, message: '请输入保质期天数！'}]}]" />
          <a-input placeholder="请输入保质期天数" v-decorator="['shelfLifeDays']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '请选择是否禁用！' }], valuePropName: 'checked'}]" />
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
      </a-form>
@@ -78,7 +78,7 @@
          this.form.setFieldsValue(
            {
              id: record.id,
              controlRuleId: record.controlRuleId,
              ruleCode: record.ruleCode,
              maxImumqty: record.maxImumqty,
              minImumqty: record.minImumqty,
              safeImumqty: record.safeImumqty,

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

@@ -7,8 +7,8 @@
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="控制属性规则ID">
                <a-input v-model="queryParam.controlRuleId" allow-clear placeholder="请输入控制属性规则ID"/>
              <a-form-item label="控制属性规则编号">
                <a-input v-model="queryParam.ruleCode" allow-clear placeholder="请输入控制属性规则编号"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
@@ -104,7 +104,6 @@
    </a-card>
    </div>
    <a-card :bordered="false">
        <!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
      <s-table
        ref="table"
        :columns="columns"
@@ -113,7 +112,7 @@
        @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('WmsControlRuleDetail:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
@@ -193,24 +192,24 @@
    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
    },
    {
    title: '控制属性规则ID',
    title: '控制属性规则编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '140px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '140px'//最小列宽设置
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'controlRuleId'
    dataIndex: 'ruleCode'
    },
    {
    title: '最高库存',

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleInput.cs

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleOutput.cs

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/IWmsControlRuleService.cs

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Map/WmsControlRuleMapper.cs

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/WmsControlRuleService.cs

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs

@@ -11,9 +11,9 @@
    public class WmsControlRuleDetailSearch : PageInputBase
    {
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// </summary>
        public virtual long? ControlRuleId { get; set; }
        public virtual string RuleCode { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
@@ -83,9 +83,9 @@
    public class WmsControlRuleDetailSearchNonPage : PageInputNonPageBase
    {
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// </summary>
        public virtual long? ControlRuleId { get; set; }
        public virtual string RuleCode { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
@@ -155,58 +155,50 @@
    public class WmsControlRuleDetailInput
    {
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// </summary>
        [Required(ErrorMessage = "控制属性规则ID不能为空")]
        public virtual long ControlRuleId { get; set; }
        [Required(ErrorMessage = "控制属性规则编号不能为空")]
        public virtual string RuleCode { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        [Required(ErrorMessage = "最高库存不能为空")]
        public virtual decimal MaxImumqty { get; set; }
        public virtual decimal? MaxImumqty { get; set; }
        
        /// <summary>
        /// æœ€ä½Žåº“å­˜
        /// </summary>
        [Required(ErrorMessage = "最低库存不能为空")]
        public virtual decimal MinImumqty { get; set; }
        public virtual decimal? MinImumqty { get; set; }
        
        /// <summary>
        /// å®‰å…¨åº“å­˜
        /// </summary>
        [Required(ErrorMessage = "安全库存不能为空")]
        public virtual decimal SafeImumqty { get; set; }
        public virtual decimal? SafeImumqty { get; set; }
        
        /// <summary>
        /// æœ€å°åº“龄
        /// </summary>
        [Required(ErrorMessage = "最小库龄不能为空")]
        public virtual decimal MinStorageAge { get; set; }
        public virtual decimal? MinStorageAge { get; set; }
        
        /// <summary>
        /// æœ€å¤§åº“龄
        /// </summary>
        [Required(ErrorMessage = "最大库龄不能为空")]
        public virtual decimal MaxStorageAge { get; set; }
        public virtual decimal? MaxStorageAge { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å…æ£€
        /// </summary>
        [Required(ErrorMessage = "是否免检不能为空")]
        public virtual bool IsNotChek { get; set; }
        public virtual bool? IsNotChek { get; set; }
        
        /// <summary>
        /// ä¿è´¨æœŸå¤©æ•°
        /// </summary>
        [Required(ErrorMessage = "保质期天数不能为空")]
        public virtual decimal ShelfLifeDays { get; set; }
        public virtual decimal? ShelfLifeDays { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [Required(ErrorMessage = "是否禁用不能为空")]
        public virtual bool IsDisabled { get; set; }
        public virtual bool? IsDisabled { get; set; }
        
    }


 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs

@@ -9,49 +9,49 @@
    public class WmsControlRuleDetailOutput
    {
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// </summary>
        public long ControlRuleId { get; set; }
        public string RuleCode { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        public decimal MaxImumqty { get; set; }
        public decimal? MaxImumqty { get; set; }
        
        /// <summary>
        /// æœ€ä½Žåº“å­˜
        /// </summary>
        public decimal MinImumqty { get; set; }
        public decimal? MinImumqty { get; set; }
        
        /// <summary>
        /// å®‰å…¨åº“å­˜
        /// </summary>
        public decimal SafeImumqty { get; set; }
        public decimal? SafeImumqty { get; set; }
        
        /// <summary>
        /// æœ€å°åº“龄
        /// </summary>
        public decimal MinStorageAge { get; set; }
        public decimal? MinStorageAge { get; set; }
        
        /// <summary>
        /// æœ€å¤§åº“龄
        /// </summary>
        public decimal MaxStorageAge { get; set; }
        public decimal? MaxStorageAge { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å…æ£€
        /// </summary>
        public bool IsNotChek { get; set; }
        public bool? IsNotChek { get; set; }
        
        /// <summary>
        /// ä¿è´¨æœŸå¤©æ•°
        /// </summary>
        public decimal ShelfLifeDays { get; set; }
        public decimal? ShelfLifeDays { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool IsDisabled { get; set; }
        public bool? IsDisabled { get; set; }
        
        /// <summary>
        /// Id主键

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs

@@ -50,7 +50,7 @@
        public async Task<PageResult<WmsControlRuleDetailOutput>> Page([FromQuery] WmsControlRuleDetailSearch input)
        {
            var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
                                     .Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
                                     .Where(!string.IsNullOrEmpty(input.RuleCode), u => u.RuleCode == input.RuleCode)
                                     .Where(input.MaxImumqty != null, u => u.MaxImumqty == input.MaxImumqty)
                                     .Where(input.MinImumqty != null, u => u.MinImumqty == input.MinImumqty)
                                     .Where(input.SafeImumqty != null, u => u.SafeImumqty == input.SafeImumqty)
@@ -77,7 +77,7 @@
        [HttpGet("WmsControlRuleDetail/listNonPage")]
        public async Task<List<WmsControlRuleDetailOutput>> ListNonPageAsync([FromQuery] WmsControlRuleDetailSearchNonPage input)
        {
            var pControlRuleId = input.ControlRuleId;
            var pRuleCode = input.RuleCode?.Trim() ?? "";
            var pMaxImumqty = input.MaxImumqty;
            var pMinImumqty = input.MinImumqty;
            var pSafeImumqty = input.SafeImumqty;
@@ -91,7 +91,7 @@
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
                .Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
                .Where(!string.IsNullOrEmpty(pRuleCode), u => u.RuleCode == pRuleCode)
                .Where(pMaxImumqty != null, u => u.MaxImumqty == pMaxImumqty)
                .Where(pMinImumqty != null, u => u.MinImumqty == pMinImumqty)
                .Where(pSafeImumqty != null, u => u.SafeImumqty == pSafeImumqty)
@@ -240,7 +240,7 @@
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _ControlRuleId = "";//控制属性规则ID
                           var _RuleCode = "";//控制属性规则编号
                           var _MaxImumqty = "";//最高库存
                           var _MinImumqty = "";//最低库存
                           var _SafeImumqty = "";//安全库存
@@ -254,7 +254,7 @@
                          
                          
                          #region å–值
                           _ControlRuleId = row["控制属性规则ID"]?.ToString() ;
                           _RuleCode = row["控制属性规则编号"]?.ToString() ;
                           _MaxImumqty = row["最高库存"]?.ToString() ;
                           _MinImumqty = row["最低库存"]?.ToString() ;
                           _SafeImumqty = row["安全库存"]?.ToString() ;
@@ -269,33 +269,15 @@
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_ControlRuleId))
                          if (string.IsNullOrEmpty(_RuleCode))
                          {
                            throw Oops.Oh($"第{index}行[控制属性规则ID]{_ControlRuleId}不能为空！");
                            throw Oops.Oh($"第{index}行[控制属性规则编号]{_RuleCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_ControlRuleId))
                          if(!string.IsNullOrEmpty(_RuleCode))
                          {
                              if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[控制属性规则ID]{_ControlRuleId}值不正确！");
                                addItem.RuleCode = (string)_RuleCode;
                              }
                              if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[控制属性规则ID]{_ControlRuleId}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.ControlRuleId = outControlRuleId;
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_MaxImumqty))
                          {
                            throw Oops.Oh($"第{index}行[最高库存]{_MaxImumqty}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaxImumqty))
                          {
                              if (!decimal.TryParse(_MaxImumqty, out decimal outMaxImumqty)&&!string.IsNullOrEmpty(_MaxImumqty))
@@ -312,12 +294,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_MinImumqty))
                          {
                            throw Oops.Oh($"第{index}行[最低库存]{_MinImumqty}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MinImumqty))
                          {
                              if (!decimal.TryParse(_MinImumqty, out decimal outMinImumqty)&&!string.IsNullOrEmpty(_MinImumqty))
@@ -334,12 +310,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_SafeImumqty))
                          {
                            throw Oops.Oh($"第{index}行[安全库存]{_SafeImumqty}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_SafeImumqty))
                          {
                              if (!decimal.TryParse(_SafeImumqty, out decimal outSafeImumqty)&&!string.IsNullOrEmpty(_SafeImumqty))
@@ -356,12 +326,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_MinStorageAge))
                          {
                            throw Oops.Oh($"第{index}行[最小库龄]{_MinStorageAge}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MinStorageAge))
                          {
                              if (!decimal.TryParse(_MinStorageAge, out decimal outMinStorageAge)&&!string.IsNullOrEmpty(_MinStorageAge))
@@ -378,12 +342,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_MaxStorageAge))
                          {
                            throw Oops.Oh($"第{index}行[最大库龄]{_MaxStorageAge}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaxStorageAge))
                          {
                              if (!decimal.TryParse(_MaxStorageAge, out decimal outMaxStorageAge)&&!string.IsNullOrEmpty(_MaxStorageAge))
@@ -400,12 +358,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_IsNotChek))
                          {
                            throw Oops.Oh($"第{index}行[是否免检]{_IsNotChek}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_IsNotChek))
                          {
                            if(!_IsNotChek.Equals("是") && !_IsNotChek.Equals("否"))
@@ -417,12 +369,6 @@
                               bool outIsNotChek = _IsNotChek.Equals("是") ? true : false;
                               addItem.IsNotChek = outIsNotChek;
                             }
                             }
                          
                          
                          if (string.IsNullOrEmpty(_ShelfLifeDays))
                          {
                            throw Oops.Oh($"第{index}行[保质期天数]{_ShelfLifeDays}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_ShelfLifeDays))
@@ -441,12 +387,6 @@
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_IsDisabled))
                          {
                            throw Oops.Oh($"第{index}行[是否禁用]{_IsDisabled}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_IsDisabled))
                          {
                            if(!_IsDisabled.Equals("是") && !_IsDisabled.Equals("否"))
@@ -521,7 +461,7 @@
           {
                   //数据是否存在重复
                   isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
                                   u.ControlRuleId.Equals(input.ControlRuleId)
                                   u.RuleCode.Equals(input.RuleCode)
                   ,false);
          }
           else//编辑 
@@ -532,7 +472,7 @@
                 //当前编辑数据以外是否存在重复
                  isExist = await _wmsControlRuleDetailRep.AnyAsync(u => 
                                    u.Id != input.Id
                                    &&u.ControlRuleId.Equals(input.ControlRuleId)
                                    &&u.RuleCode.Equals(input.RuleCode)
                    ,false);
               }
               
@@ -555,17 +495,17 @@
                 }
                 //数据是否重复
                 var existExcelItem = inputs.GroupBy(g => new {
                                               g.ControlRuleId
                                               g.RuleCode
                                               })
                                               .Where(g => g.Count() > 1)
                                               .Select(s => new {
                                               s.Key.ControlRuleId
                                               s.Key.RuleCode
                                               }).FirstOrDefault();
                 if (existExcelItem != null)
                 {
                   var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
                   var item= existExcelItem.Adapt<WmsControlRuleDetail>();
                   throw Oops.Oh($"导入的表格中,控制属性规则ID[{item.ControlRuleId}]已存在");
                   throw Oops.Oh($"导入的表格中,控制属性规则编号[{item.RuleCode}]已存在");
                 }
                      

@@ -574,16 +514,16 @@
    //根据联合主键验证数据库中是否已存在相同数据
                 var existDBItem = await _wmsControlRuleDetailRep.DetachedEntities.FirstOrDefaultAsync(w=> 
                                                                         inputs.Select(s=>""
                                                                           +s.ControlRuleId
                                                                           +s.RuleCode
                                                                        )
                                                                        .Contains(""
                                                                         +w.ControlRuleId
                                                                         +w.RuleCode
                  ));
                  if (existDBItem != null)
                 {
                   var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
                   var item= existExcelItem.Adapt<WmsControlRuleDetail>();
                   throw Oops.Oh($"系统中,控制属性规则ID[{item.ControlRuleId}]已存在");
                   throw Oops.Oh($"系统中,控制属性规则编号[{item.RuleCode}]已存在");
                 }
        }


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

ÎļþÒÑɾ³ý

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

@@ -4,7 +4,7 @@

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/4/23下午5:01:43
 * @date : 2024/4/24下午5:51:26
 * @desc : æŽ§åˆ¶å±žæ€§è§„则明细
 */
namespace Admin.NET.Core
@@ -19,12 +19,12 @@


        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则ID
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// </summary>
        [Comment("控制属性规则ID")]
        [Comment("控制属性规则编号")]
        [Required]

        public long ControlRuleId { get; set; }
        [MaxLength(50)]
        public string RuleCode { get; set; }


        /// <summary>

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

Binary files differ

 ʹÓÃÎĵµ/PDManerÎļþ/Ô­²ÄÁÏ¿â±ê×¼»¯.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.1.3",
  "createdTime": "2024-4-12 12:56:29",
  "updatedTime": "2024-4-24 16:53:19",
  "updatedTime": "2024-4-24 17:51:09",
  "dbConns": [],
  "profile": {
    "default": {
@@ -103,7 +103,7 @@
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建人Id",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -121,7 +121,7 @@
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改人Id",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -21734,7 +21734,7 @@
        },
        {
          "defKey": "ErpCode",
          "defName": "ERP库存地",
          "defName": "ERP代码",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
@@ -21965,7 +21965,7 @@
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建人Id",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -21993,7 +21993,7 @@
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "defName": "创建者名称",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
@@ -22021,7 +22021,7 @@
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改人Id",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -22049,7 +22049,7 @@
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "defName": "修改者名称",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
@@ -32872,6 +32872,153 @@
          "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
        },
        {
          "defKey": "IsSrmPlace",
          "defName": "是否堆垛机库位",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "335D3433-78A5-4213-A410-95E1EFF532D6"
        },
        {
          "defKey": "SrmPlaceNo",
          "defName": "堆垛机库位号",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "BC41E431-8E6A-4253-83F4-E589578322AA",
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD",
          "extProps": {},
          "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
        },
        {
          "defKey": "IsRgvPlace",
          "defName": "是否RGV库位",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "B18994CA-EB0C-4402-BB8E-749C080166F4"
        },
        {
          "defKey": "RgvPlaceNo",
          "defName": "RGV库位号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "3146288B-6B5D-447C-9339-7DB5D90E56FD"
        },
        {
          "defKey": "IsAgvPlace",
          "defName": "是否AGV库位",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "3BCB2418-C037-45BE-90B7-23F37696721B"
        },
        {
          "defKey": "AgvPlaceNo",
          "defName": "AGV库位号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "B07702F7-3F57-4A8E-B5EA-8A70FD6463E3"
        },
        {
          "defKey": "IsTransPlace",
          "defName": "是否输送线库位",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "4FD2149A-C5A6-45C0-A72B-0476A5967CF7"
        },
        {
          "defKey": "TransPlaceNo",
          "defName": "输送线库位号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "755769AB-B19A-4E22-8BA3-2E44E4AC7D86"
        },
        {
          "defKey": "IsActivateWCS",
          "defName": "是否激活与任务调度",
          "comment": "",
@@ -33418,7 +33565,7 @@
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建人Id",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -33446,7 +33593,7 @@
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "defName": "创建者名称",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
@@ -33474,7 +33621,7 @@
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改人Id",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -33502,7 +33649,7 @@
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "defName": "修改者名称",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
@@ -42241,7 +42388,7 @@
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建人Id",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -42259,7 +42406,7 @@
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改人Id",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
@@ -45101,332 +45248,6 @@
      }
    },
    {
      "id": "6CAD48AB-70AB-4DBE-8CF4-B6D8A8A78AEE",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "wms_control_rule",
      "defName": "控制属性规则",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true,
          "freeze": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "type": "",
          "len": 32,
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "uiHint": "",
          "id": "124032A4-CAD4-4496-AC39-0C286CCE7CA1",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "RuleCode",
          "defName": "规则编号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "EA50CBBB-1767-4101-9DAC-7C8E302241E9",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "RuleName",
          "defName": "规则名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "A145DF29-EA07-4308-B410-4DE14F29DC8B",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "RuleDesc",
          "defName": "规则描述",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "ED8FCC44-999B-4952-9B40-A20A86C78EE5",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "IsDisabled",
          "defName": "是否禁用",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "7C32FC58-EB02-4D9F-9FA1-B1ADF198A791"
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "C3A81AF1-28C1-43A0-98CA-64CFFD9447B5",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedTime",
          "defName": "创建时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "5ED71435-1C02-4592-8665-B6BE97499E73",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "8D5F93E3-5C5F-4C4F-97FF-A66A4476B183",
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
        },
        {
          "defKey": "UpdatedTime",
          "defName": "修改时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "BC078593-0615-4B40-8DC8-5AC22816602D",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "C7685E04-D334-47B9-8EF6-CBD8E14A0D1A",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "4879E615-3C4A-4D1B-98DC-589567CD9B92",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "IsDeleted",
          "defName": "软删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "AA1E5DF6-BD1F-4FC2-B4E3-AD2B96C00BD2",
          "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
        }
      ],
      "correlations": [],
      "indexes": [],
      "type": "P",
      "sysProps": {
        "nameTemplate": "{defKey}[{defName}]"
      },
      "notes": {}
    },
    {
      "id": "5BA66776-30F0-4C71-92A3-0A6CB6985823",
      "env": {
        "base": {
@@ -45547,8 +45368,8 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "ControlRuleId",
          "defName": "控制属性规则ID",
          "defKey": "RuleCode",
          "defName": "控制属性规则编号",
          "comment": "",
          "type": "",
          "len": "",
@@ -45560,9 +45381,8 @@
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "id": "1C340822-4286-4525-916F-75E29EEEBAA0",
          "baseType": "87021CD5-DD8A-45AD-A867-A55DFE7993F5"
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "5B84BCB4-4D25-43C3-9DF6-5D8F9B7DA5EB"
        },
        {
          "defKey": "MaxImumqty",
@@ -48393,335 +48213,6 @@
      ],
      "correlations": [],
      "indexes": []
    },
    {
      "id": "A9C5E453-7EE0-447F-97B1-AF52177E7E2E",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "wms_equipment_place",
      "defName": "设备库位关联信息",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "nameTemplate": "{defKey}[{defName}]",
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "type": "",
          "len": 32,
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "uiHint": "",
          "id": "FD6CFC18-8FF1-4AC9-9591-8D83EE7EC6C7",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "EquipmentNo",
          "defName": "设备号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "4B7A4560-9A82-4E0D-913C-4397ACC815A0"
        },
        {
          "defKey": "PlaceNo",
          "defName": "库位号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "CC93D3DD-2AF1-4A4E-AC83-894197701520"
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "3F8A210A-A76C-4D93-8328-6CC79B7875EF",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedTime",
          "defName": "创建时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "7796D18C-32E1-4472-9811-E2983F1E3ECB",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "9FCCB6EB-3536-4ACF-92EA-EE685B1E4869",
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
        },
        {
          "defKey": "UpdatedTime",
          "defName": "修改时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "89D9334C-753F-494A-ACC8-38F38C58C907",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建人Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "1924CB76-82B6-4697-BA4D-4A22505420F4",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改人Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "1EC5776B-1E12-4656-941E-93D9202636F8",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "IsDeleted",
          "defName": "软删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "D689DF98-A794-4AF4-8C2C-DB63E7306698",
          "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
        }
      ],
      "correlations": [],
      "indexes": []
    }
  ],
  "views": [
@@ -49268,12 +48759,10 @@
        "7652F7C6-BE52-40C1-8B4E-030BCA44DF1C",
        "B096C24D-5DD5-47CD-8AE2-18F09DA54D3B",
        "613EBABC-DE71-4B38-9917-77A72D988753",
        "6CAD48AB-70AB-4DBE-8CF4-B6D8A8A78AEE",
        "5BA66776-30F0-4C71-92A3-0A6CB6985823",
        "30A9CA8E-93F6-4AFB-A388-CA0C01F74222",
        "AD6794A1-3C5C-4DA3-86A9-222FBBFD109D",
        "041BF159-8998-4542-84A3-5E07D1616AF1",
        "A9C5E453-7EE0-447F-97B1-AF52177E7E2E"
        "041BF159-8998-4542-84A3-5E07D1616AF1"
      ],
      "refViews": [],
      "refDiagrams": [],