Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

schangxiang@126.com

2024-04-25 1eb08ced0ef966804e96c9b792bba45ca6eb6601

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="新增客户档案"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -121,3 +121,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="编辑客户档案"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -146,3 +146,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="新增库区信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="新增库区信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -148,3 +148,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="编辑库区信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="编辑库区信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -157,3 +157,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -832,4 +832,5 @@
  button {
    margin-right: 8px;
  }

</style>

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

@@ -193,7 +193,7 @@
          <span slot="action" slot-scope="text, record">
            
            <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a> -->
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add()">编辑</a>
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">编辑</a>

          <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsMaterialDelete(record)">

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue

@@ -1,5 +1,5 @@
<template>
  <a-modal title="新增基础物料信息" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <!-- tab -->
@@ -145,6 +145,7 @@
  },
  data() {
    return {
      title: '',
      labelCol: {
        // xs: { span: 24 },
        // sm: { span: 5 }
@@ -207,14 +208,21 @@
    handleOk() { },
    // åˆå§‹åŒ–方法
    add(record) {
      this.visible = true
      // this.$nextTick(() => {
      //   // this.getSelects()
      // })
      const materialTypeOption = this.$options
      this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
      // const inspectionMethodOption = this.$options
      // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
        this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')

      this.visible = true
      if (record) {//编辑
        this.title = '编辑基础物料信息';
        this.$nextTick(() => {
          this.form.setFieldsValue({
            ...record
          })
        })
     
      } else { // æ–°å¢ž
        this.title = '新增基础物料信息';
      }
    },
    getSelects() {
      if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -329,8 +337,8 @@
</script>

<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
.ant-row.ant-form-item {
  width: 50% !important;
  display: inline-block;
}
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="新增库位信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="新增库位信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -209,3 +209,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="编辑库位信息"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -243,3 +243,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -127,3 +127,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -149,3 +149,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -16,6 +16,11 @@
        public virtual string RuleCode { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则名称
        /// </summary>
        public virtual string RuleName { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        public virtual decimal? MaxImumqty { get; set; }
@@ -88,6 +93,11 @@
        public virtual string RuleCode { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则名称
        /// </summary>
        public virtual string RuleName { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        public virtual decimal? MaxImumqty { get; set; }
@@ -155,10 +165,10 @@
    public class WmsControlRuleDetailInput
    {
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则编号
        /// æŽ§åˆ¶å±žæ€§è§„则名称
        /// </summary>
        [Required(ErrorMessage = "控制属性规则编号不能为空")]
        public virtual string RuleCode { get; set; }
        [Required(ErrorMessage = "控制属性规则名称不能为空")]
        public virtual string RuleName { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜

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

@@ -14,6 +14,11 @@
        public string RuleCode { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则名称
        /// </summary>
        public string RuleName { get; set; }
        
        /// <summary>
        /// æœ€é«˜åº“å­˜
        /// </summary>
        public decimal? MaxImumqty { get; set; }

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

@@ -51,6 +51,7 @@
        {
            var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
                                     .Where(!string.IsNullOrEmpty(input.RuleCode), u => u.RuleCode == input.RuleCode)
                                     .Where(!string.IsNullOrEmpty(input.RuleName), u => u.RuleName == input.RuleName)
                                     .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)
@@ -78,6 +79,7 @@
        public async Task<List<WmsControlRuleDetailOutput>> ListNonPageAsync([FromQuery] WmsControlRuleDetailSearchNonPage input)
        {
            var pRuleCode = input.RuleCode?.Trim() ?? "";
            var pRuleName = input.RuleName?.Trim() ?? "";
            var pMaxImumqty = input.MaxImumqty;
            var pMinImumqty = input.MinImumqty;
            var pSafeImumqty = input.SafeImumqty;
@@ -92,6 +94,7 @@
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
                .Where(!string.IsNullOrEmpty(pRuleCode), u => u.RuleCode == pRuleCode)
                .Where(!string.IsNullOrEmpty(pRuleName), u => u.RuleName == pRuleName)
                .Where(pMaxImumqty != null, u => u.MaxImumqty == pMaxImumqty)
                .Where(pMinImumqty != null, u => u.MinImumqty == pMinImumqty)
                .Where(pSafeImumqty != null, u => u.SafeImumqty == pSafeImumqty)
@@ -143,7 +146,8 @@
        public async Task Add(AddWmsControlRuleDetailInput input)
        {
            var wmsControlRuleDetail = input.Adapt<WmsControlRuleDetail>();
                        //验证
            wmsControlRuleDetail.RuleCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO è¦è°ƒç”¨ç”Ÿæˆ ç¼–号的方法 å…ˆç”¨é›ªèŠ±ID
                                                                                       //验证
            await CheckExisit(wmsControlRuleDetail);

            wmsControlRuleDetail.CreatedUserId = wmsControlRuleDetail.UpdatedUserId = SysHelper.GetUserId();
@@ -240,7 +244,7 @@
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _RuleCode = "";//控制属性规则编号
                           var _RuleName = "";//控制属性规则名称
                           var _MaxImumqty = "";//最高库存
                           var _MinImumqty = "";//最低库存
                           var _SafeImumqty = "";//安全库存
@@ -249,12 +253,11 @@
                           var _IsNotChek = "";//是否免检
                           var _ShelfLifeDays = "";//保质期天数
                           var _IsDisabled = "";//是否禁用
                           var _Id = "";//Id主键
                          #endregion
                          
                          
                          #region å–值
                           _RuleCode = row["控制属性规则编号"]?.ToString() ;
                           _RuleName = row["控制属性规则名称"]?.ToString() ;
                           _MaxImumqty = row["最高库存"]?.ToString() ;
                           _MinImumqty = row["最低库存"]?.ToString() ;
                           _SafeImumqty = row["安全库存"]?.ToString() ;
@@ -263,20 +266,20 @@
                           _IsNotChek = row["是否免检"]?.ToString() ;
                           _ShelfLifeDays = row["保质期天数"]?.ToString() ;
                           _IsDisabled = row["是否禁用"]?.ToString() ;
                           _Id = row["Id主键"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_RuleCode))
              
                #endregion


                #region éªŒè¯

                if (string.IsNullOrEmpty(_RuleName))
                          {
                            throw Oops.Oh($"第{index}行[控制属性规则编号]{_RuleCode}不能为空！");
                            throw Oops.Oh($"第{index}行[控制属性规则名称]{_RuleName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_RuleCode))
                          if(!string.IsNullOrEmpty(_RuleName))
                          {
                                addItem.RuleCode = (string)_RuleCode;
                                addItem.RuleName = (string)_RuleName;
                           }
                          if(!string.IsNullOrEmpty(_MaxImumqty))
                          {
@@ -369,7 +372,7 @@
                               bool outIsNotChek = _IsNotChek.Equals("是") ? true : false;
                               addItem.IsNotChek = outIsNotChek;
                             }
                             }
                           }
                          
                          if(!string.IsNullOrEmpty(_ShelfLifeDays))
                          {
@@ -399,27 +402,12 @@
                               addItem.IsDisabled = outIsDisabled;
                             }
                             }
                          
                          if(!string.IsNullOrEmpty(_Id))
                          {
                              if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不正确！");
                              }
                              if (outId <= 0&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Id = outId;
                              }
                          
                          }
                          #endregion
                          

              

                #endregion


                addItem.RuleCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO è¦è°ƒç”¨ç”Ÿæˆ ç¼–号的方法 å…ˆç”¨é›ªèŠ±ID
                details.Add(addItem);
            }
              //验重
@@ -461,7 +449,7 @@
           {
                   //数据是否存在重复
                   isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
                                   u.RuleCode.Equals(input.RuleCode)
                                   u.RuleName.Equals(input.RuleName)
                   ,false);
          }
           else//编辑 
@@ -472,7 +460,7 @@
                 //当前编辑数据以外是否存在重复
                  isExist = await _wmsControlRuleDetailRep.AnyAsync(u => 
                                    u.Id != input.Id
                                    &&u.RuleCode.Equals(input.RuleCode)
                                    &&u.RuleName.Equals(input.RuleName)
                    ,false);
               }
               
@@ -495,17 +483,16 @@
                 }
                 //数据是否重复
                 var existExcelItem = inputs.GroupBy(g => new {
                                               g.RuleCode
                                               g.RuleName
                                               })
                                               .Where(g => g.Count() > 1)
                                               .Select(s => new {
                                               s.Key.RuleCode
                                               s.Key.RuleName
                                               }).FirstOrDefault();
                 if (existExcelItem != null)
                 {
                   var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
                   var item= existExcelItem.Adapt<WmsControlRuleDetail>();
                   throw Oops.Oh($"导入的表格中,控制属性规则编号[{item.RuleCode}]已存在");
                   throw Oops.Oh($"导入的表格中,控制属性规则名称[{item.RuleName}]已存在");
                 }
                      

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


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

@@ -26,6 +26,13 @@
        [MaxLength(50)]
        public string RuleCode { get; set; }

        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则名称
        /// </summary>
        [Comment("控制属性规则名称")]
        [Required]
        [MaxLength(50)]
        public string RuleName { get; set; }

        /// <summary>
        /// æœ€é«˜åº“å­˜
@@ -77,7 +84,7 @@
        /// </summary>
        [Comment("是否免检")]

        public bool? IsNotChek { get; set; }
        public bool IsNotChek { get; set; }


        /// <summary>

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

Binary files differ