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

schangxiang@126.com

2025-05-14 792f2462a2ce5141f72bee69fe9ec003856905a1

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

 HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx

@@ -350,7 +350,7 @@
          <div class={styles.headerContent}>
            <div class={styles.header}>
              <IconButton
                v-permission="wmsMaterialStockDetail-add"
                v-permission="wmsMaterialStock-add"
                icon="add-p"
                onClick={onAddWmsMaterialStock}
                type="primary"
@@ -374,7 +374,7 @@
              </el-upload> */}

              <IconButton
                v-permission="wmsMaterialStockDetail-output"
                v-permission="wmsMaterialStock-output"
                icon="out"
                onClick={handleExport}
              >
@@ -408,7 +408,7 @@
                é‡ç½® 
              </IconButton> */}
              <IconButton
                v-permission="wmsMaterialStock-add"
                v-permission="wmsMaterialStockDetail-hightQuery"
                icon="search"
                onClick={onAdvancedQuery}
                type="primary"

 HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx

@@ -18,6 +18,7 @@
  getAreaAreaDataList,
  getWmsEnumData,
} from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
import { lang } from '@/libs/Language/Language'

export const useWmsPlaceDrawer = (props: any, ctx?: any) => {
  const wmsPlaceDrawer = injectModel<WmsPlaceDrawer>('wmsPlaceDrawer')
@@ -137,6 +138,19 @@
      ],
    },
    {
      label: '是否禁用',
      prop: 'isDisabled',
      el: 'select',
      options: [
        { label: '是', value: true },
        { label: '否', value: false },
      ],
      placeholder: '请选择是否禁用',
      rules: [
        { required: true, message: '是否禁用不能为空', trigger: 'change' },
      ],
    },
    {
      label: '最大库存数',
      prop: 'maxStockNumber',
      el: (props: any, { attrs }: SetupContext) => {
@@ -203,11 +217,13 @@
      emptyContainer: formData.value.emptyContainer, // æ˜¯å¦ç©ºæ‰˜
      maxStockNumber: formData.value.maxStockNumber, // æœ€å¤§åº“存数
      remark: formData.value.remark, // å¤‡æ³¨
      isDisabled: formData.value.isDisabled, // æ˜¯å¦ç¦ç”¨
    }
    if (!current.value) {
      await wmsPlaceDrawer.addWmsPlace(data)
    } else {
      const id = current.value.id
      console.log(data, 'data')
      await wmsPlaceDrawer.updateWmsPlace(id, data)
    }
    ElMessage.success('保存成功')
@@ -279,6 +295,7 @@
        emptyContainer: res.emptyContainer, // æ˜¯å¦ç©ºæ‰˜
        remark: res.remark, // å¤‡æ³¨
        maxStockNumber: res.maxStockNumber, // æœ€å¤§åº“存数
        isDisabled: res.isDisabled, // æ˜¯å¦ç¦ç”¨
        id: res.id, // ä¸»é”®ID
      }
      updateCheckData()
@@ -290,6 +307,7 @@
        aisle: 1, // å··é“
        layerNo: 1, // å±‚
        islock: 0, // æ˜¯å¦é”å®š
        isDisabled: false, // æ˜¯å¦ç¦ç”¨
        emptyContainer: 0, // æ˜¯å¦ç©ºæ‰˜
      }
      updateCheckData()

 HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts

@@ -50,6 +50,11 @@
    field: 'emptyContainerDesc',
    title: '是否空托',
  },

  {
    field: 'isDisabled',
    title: '是否禁用',
  },
  {
    field: 'remark',
    title: '备注',

 HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx

@@ -205,6 +205,17 @@
            isHidePagination={isHidePagination}
            pageSize={50}
            v-slots={{
              isDisabled: ({ row }: any) => {
                return (
                  <div>
                    {row.isDisabled != null
                      ? row.isDisabled
                        ? '是'
                        : '否'
                      : '-'}
                  </div>
                )
              },
              name: ({ row }: any) => {
                return row?.name ? (
                  <TdButton

 HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts

@@ -72,10 +72,10 @@
    field: 'mutableParam1',
    title: '型号',
  },
  // {
  //   field: 'mutableParam2',
  //   title: '可变变量2',
  // },
  {
    field: 'mutableParam2',
    title: '原料标识',
  },
  // {
  //   field: 'mutableParam3',
  //   title: '可变变量3',

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs ÐÞ¸Ä
@@ -1,12 +1,12 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;

/// <summary>
/// WmsArea查询参数对象
/// </summary>
public class GetWmsAreasInput : ExtensiblePagedAndSortedResultRequestDto
public class GetWmsAreaInput : ExtensiblePagedAndSortedResultRequestDto
{
    /// <summary>
    /// Gets or sets the filter.

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;

/// <summary>
/// WmsArea创建参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateOrUpdateDtoBase.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;

/// <summary>
/// WmsArea创建或更新基类

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;

/// <summary>
/// WmsArea数据参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaUpdateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;

/// <summary>
/// WmsArea更新参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasExportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea
{
    /// <summary>
    /// WmsAreas导出模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasImportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreasExportModel;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreasExportModel;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea
{
    /// <summary>
    /// WmsAreas导入模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs ÐÞ¸Ä
@@ -1,12 +1,12 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;

/// <summary>
/// WmsContainer查询参数对象
/// </summary>
public class GetWmsContainersInput : ExtensiblePagedAndSortedResultRequestDto
public class GetWmsContainerInput : ExtensiblePagedAndSortedResultRequestDto
{
    /// <summary>
    /// Gets or sets the filter.

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;

/// <summary>
/// WmsContainer创建参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateOrUpdateDtoBase.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;

/// <summary>
/// WmsContainer创建或更新基类

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;

/// <summary>
/// WmsContainer数据参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerUpdateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;

/// <summary>
/// WmsContainer更新参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersExportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer
{
    /// <summary>
    /// WmsContainers导出模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersImportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers.WmsContainersExportModel;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer.WmsContainersExportModel;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer
{
    /// <summary>
    /// WmsContainers导入模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/ExportWmsMaterialModel.cs ÐÞ¸Ä
@@ -6,7 +6,7 @@
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
{
    /// <summary>
    /// å¯¼å‡ºå®žä½“ç±»

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs ÐÞ¸Ä
@@ -1,12 +1,12 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial查询参数对象
/// </summary>
public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto
public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto
{
    /// <summary>
    /// Gets or sets the filter.

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial创建参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial创建或更新基类

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial数据参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using System.ComponentModel;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
{

    /// <summary>

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsImportModel.cs ÐÞ¸Ä
@@ -1,10 +1,10 @@

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
{
    /// <summary>
    /// WmsMaterials导入模型
    /// </summary>
    public class WmsMaterialsImportModel
    public class WmsMaterialImportModels
    {
        private List<WmsMaterialImportModel> _wmsmaterials = new();


 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialUpdateDto.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial更新参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/GetWmsPlacesInput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;

/// <summary>
/// WmsPlace查询参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;

/// <summary>
/// WmsPlace创建参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateOrUpdateDtoBase.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;

/// <summary>
/// WmsPlace创建或更新基类

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;

/// <summary>
/// WmsPlace数据参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceUpdateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;

/// <summary>
/// WmsPlace更新参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesExportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace
{
    /// <summary>
    /// WmsPlaces导出模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesImportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlacesExportModel;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlacesExportModel;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace
{
    /// <summary>
    /// WmsPlaces导入模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs ÐÞ¸Ä
@@ -1,11 +1,11 @@
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;

/// <summary>
/// WmsStore查询参数对象
/// </summary>
public class GetWmsStoresInput : ExtensiblePagedAndSortedResultRequestDto
public class GetWmsStoreInput : ExtensiblePagedAndSortedResultRequestDto
{
    /// <summary>
    /// Gets or sets the filter.

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;

/// <summary>
/// WmsStore创建参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateOrUpdateDtoBase.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;

/// <summary>
/// WmsStore创建或更新基类

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;

/// <summary>
/// WmsStore数据参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreUpdateDto.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;

/// <summary>
/// WmsStore更新参数对象

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresExportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using MiniExcelLibs.Attributes;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore
{
    /// <summary>
    /// WmsStores导出模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresImportModel.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores.WmsStoresExportModel;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore.WmsStoresExportModel;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore
{
    /// <summary>
    /// WmsStores导入模型

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -6,7 +6,7 @@
/// <summary>
/// WmsArea应用服务
/// </summary>
public interface IWmsAreaAppService : ICrudAppService<WmsAreaDto, Guid, GetWmsAreasInput, WmsAreaCreateDto, WmsAreaUpdateDto>
public interface IWmsAreaAppService : ICrudAppService<WmsAreaDto, Guid, GetWmsAreaInput, WmsAreaCreateDto, WmsAreaUpdateDto>
{
    /// <summary>
    /// Clones the asynchronous.
@@ -42,5 +42,5 @@
    /// </summary>
    /// <param name="input">The input.</param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input);
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input);
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsCommonAppService.cs

@@ -1,5 +1,5 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using System;
using System.Collections.Generic;
using System.Linq;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -6,7 +6,7 @@
/// <summary>
/// WmsContainer应用服务
/// </summary>
public interface IWmsContainerAppService : ICrudAppService<WmsContainerDto, Guid, GetWmsContainersInput, WmsContainerCreateDto, WmsContainerUpdateDto>
public interface IWmsContainerAppService : ICrudAppService<WmsContainerDto, Guid, GetWmsContainerInput, WmsContainerCreateDto, WmsContainerUpdateDto>
{
    /// <summary>
    /// Clones the asynchronous.
@@ -42,5 +42,5 @@
    /// </summary>
    /// <param name="input">The input.</param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input);
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainerInput input);
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs

@@ -1,10 +1,10 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services
{

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -6,7 +6,7 @@
/// <summary>
/// WmsMaterial应用服务
/// </summary>
public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialsInput, WmsMaterialCreateDto, WmsMaterialUpdateDto>
public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialInput, WmsMaterialCreateDto, WmsMaterialUpdateDto>
{
    /// <summary>
    /// Clones the asynchronous.
@@ -35,12 +35,12 @@
    /// </summary>
    /// <param name="input">The input.</param>
    /// <returns></returns>
    Task ImportAsync(WmsMaterialsImportModel input);
    Task ImportAsync(WmsMaterialImportModels input);

    /// <summary>
    /// Exports the asynchronous.
    /// </summary>
    /// <param name="input">The input.</param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialsInput input);
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input);
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -6,7 +6,7 @@
/// <summary>
/// WmsStore应用服务
/// </summary>
public interface IWmsStoreAppService : ICrudAppService<WmsStoreDto, Guid, GetWmsStoresInput, WmsStoreCreateDto, WmsStoreUpdateDto>
public interface IWmsStoreAppService : ICrudAppService<WmsStoreDto, Guid, GetWmsStoreInput, WmsStoreCreateDto, WmsStoreUpdateDto>
{
    /// <summary>
    /// Clones the asynchronous.
@@ -42,5 +42,5 @@
    /// </summary>
    /// <param name="input">The input.</param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input);
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoreInput input);
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.Shared;
@@ -35,7 +35,7 @@
    }

    /// <inheritdoc />
    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
    public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -45,7 +45,7 @@
        }

        var specification = new WmsAreaSpecification(input.Name);
        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
        var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
        var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification);
        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);

@@ -300,7 +300,7 @@
    }

    /// <inheritdoc />
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -310,7 +310,7 @@
        }

        var specification = new WmsAreaSpecification(input.Name);
        var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
        var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
        var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs

@@ -1,6 +1,6 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
@@ -32,7 +32,7 @@
    }

    /// <inheritdoc />
    public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainersInput input)
    public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainerInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -42,7 +42,7 @@
        }

        var specification = new WmsContainerSpecification(input.Name);
        var container = ObjectMapper.Map < GetWmsContainersInput, WmsContainer>(input);
        var container = ObjectMapper.Map < GetWmsContainerInput, WmsContainer>(input);
        var count = await _wmscontainerRepository.GetCountAsync(container,input.Filter, specification);
        var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);

@@ -299,7 +299,7 @@
    }

    /// <inheritdoc />
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input)
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainerInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -309,7 +309,7 @@
        }

        var specification = new WmsContainerSpecification(input.Name);
        var container = ObjectMapper.Map<GetWmsContainersInput, WmsContainer>(input);
        var container = ObjectMapper.Map<GetWmsContainerInput, WmsContainer>(input);
        var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list);


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs

@@ -1,6 +1,6 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
@@ -13,8 +13,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;

namespace CMS.Plugin.HIAWms.Application.Implements
{

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials;
@@ -33,7 +33,7 @@
    }

    /// <inheritdoc />
    public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialsInput input)
    public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -43,7 +43,7 @@
        }

        var specification = new WmsMaterialSpecification(input.Name);
        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
        var material = ObjectMapper.Map<GetWmsMaterialInput, WmsMaterial>(input);
        var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification);

        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);
@@ -198,7 +198,7 @@
    }

    /// <inheritdoc />
    public async Task ImportAsync(WmsMaterialsImportModel input)
    public async Task ImportAsync(WmsMaterialImportModels input)
    {
        Check.NotNull(input, nameof(input));

@@ -312,7 +312,7 @@
    }

    /// <inheritdoc />
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialsInput input)
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -323,7 +323,7 @@

        var specification = new WmsMaterialSpecification(input.Name);

        var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input);
        var material = ObjectMapper.Map<GetWmsMaterialInput, WmsMaterial>(input);
        var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
@@ -104,6 +104,7 @@
        wmsplace.RedundantField2 = input.RedundantField2;
        wmsplace.RedundantField3 = input.RedundantField3;
        wmsplace.Remark = input.Remark;
        wmsplace.IsDisabled = input.IsDisabled;

        await _wmsplaceRepository.UpdateAsync(wmsplace);


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using CMS.Plugin.HIAWms.Domain.Shared;
@@ -32,7 +32,7 @@
    }

    /// <inheritdoc />
    public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoresInput input)
    public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoreInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -42,7 +42,7 @@
        }

        var specification = new WmsStoreSpecification(input.Name);
        var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
        var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input);
        var count = await _wmsstoreRepository.GetCountAsync(store,input.Filter, specification);
        var list = await _wmsstoreRepository.GetListAsync(store,input.Sorting, input.MaxResultCount,  input.SkipCount, input.Filter, specification);

@@ -275,7 +275,7 @@
    }

    /// <inheritdoc />
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input)
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoreInput input)
    {
        Check.NotNull(input, nameof(input));

@@ -285,7 +285,7 @@
        }

        var specification = new WmsStoreSpecification(input.Name);
        var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input);
        var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input);
        var list = await _wmsstoreRepository.GetListAsync(store, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list);


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using Volo.Abp.ObjectExtending;

@@ -21,6 +21,6 @@
         * into multiple profile classes for a better organization. */
        CreateMap<WmsArea, WmsAreaDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WmsAreaCreateDto, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsAreasInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsAreaInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using Volo.Abp.ObjectExtending;

@@ -21,6 +21,6 @@
         * into multiple profile classes for a better organization. */
        CreateMap<WmsContainer, WmsContainerDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WmsContainerCreateDto, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsContainersInput, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsContainerInput, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using Volo.Abp.ObjectExtending;

@@ -21,6 +21,6 @@
         * into multiple profile classes for a better organization. */
        CreateMap<WmsMaterial, WmsMaterialDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WmsMaterialCreateDto, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsMaterialsInput, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsMaterialInput, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialInfoAutoMapperProfile.cs

@@ -1,6 +1,6 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialInfos;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Domain.WmsMaterialInfos;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using Volo.Abp.ObjectExtending;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using Volo.Abp.ObjectExtending;


 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs

@@ -1,5 +1,5 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using Volo.Abp.ObjectExtending;

@@ -21,6 +21,6 @@
         * into multiple profile classes for a better organization. */
        CreateMap<WmsStore, WmsStoreDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<WmsStoreCreateDto, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsStoresInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<GetWmsStoreInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs

@@ -1,4 +1,4 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using WebApiClientCore.Attributes;

namespace CMS.Plugin.HIAWms.Apis

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs

@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -52,7 +52,7 @@
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        public virtual Task<PagedResultDto<WmsAreaDto>> GetListAsync([FromQuery] GetWmsAreasInput input)
        public virtual Task<PagedResultDto<WmsAreaDto>> GetListAsync([FromQuery] GetWmsAreaInput input)
        {
            return _wmsareaAppService.GetListAsync(input);
        }
@@ -168,7 +168,7 @@
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsAreasInput input)
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsAreaInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsareaAppService.ExportAsync(input);

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs

@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -52,7 +52,7 @@
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainersInput input)
        public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainerInput input)
        {
            return _wmscontainerAppService.GetListAsync(input);
        }
@@ -168,7 +168,7 @@
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsContainersInput input)
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsContainerInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmscontainerAppService.ExportAsync(input);

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs

@@ -1,7 +1,7 @@
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
@@ -9,8 +9,8 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Web;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;

namespace CMS.Plugin.HIAWms.Controller
{

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs

@@ -1,6 +1,6 @@
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.BindInstockDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.MaterialManagement.Abstractions.Models;
using Microsoft.AspNetCore.Mvc;

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs

@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -53,7 +53,7 @@
        /// <returns></returns>
        [HttpGet]
        [Route("Page")]
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialsInput input)
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
        {
            return _wmsmaterialAppService.GetListAsync(input);
        }
@@ -148,14 +148,14 @@
            stream.Seek(0L, SeekOrigin.Begin);

            var sheetNames = stream.GetSheetNames();
            var wmsmaterialRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new();
            var wmsmaterialRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialImportModels.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new();

            if (!wmsmaterialRows.Any())
            {
                throw new UserFriendlyException("请检查导入的表格");
            }

            await _wmsmaterialAppService.ImportAsync(new WmsMaterialsImportModel
            await _wmsmaterialAppService.ImportAsync(new WmsMaterialImportModels
            {
                WmsMaterials = wmsmaterialRows,
            });
@@ -169,7 +169,7 @@
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialsInput input)
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsmaterialAppService.ExportAsync(input);

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs

@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs

@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -52,7 +52,7 @@
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        public virtual Task<PagedResultDto<WmsStoreDto>> GetListAsync([FromQuery] GetWmsStoresInput input)
        public virtual Task<PagedResultDto<WmsStoreDto>> GetListAsync([FromQuery] GetWmsStoreInput input)
        {
            return _wmsstoreAppService.GetListAsync(input);
        }
@@ -168,7 +168,7 @@
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsStoresInput input)
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsStoreInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsstoreAppService.ExportAsync(input);

 HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs

@@ -1,6 +1,6 @@
using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness;
using CMS.Plugin.HIAWms.Apis;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Jobs;
using CMS.Project;