1

dengjunjie

2025-05-28 01030b05f7ea9b14878102718a2004b4f908dcfc

1

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/24365a37-3171-40e0-9067-b34b6860f327.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/WIDESEAWCS_BasicInfoRepository.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
  </ItemGroup>

  <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj

@@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
    <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.1.0" />
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
  </ItemGroup>

  <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
  </ItemGroup>

</Project>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WIDESEAWCS_DTO.csproj

@@ -15,7 +15,7 @@
    </ItemGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

</Project>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/WIDESEAWCS_IBasicInfoRepository.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
  </ItemGroup>

  <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/WIDESEAWCS_IBasicInfoService.csproj

@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
    <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
  </ItemGroup>

  <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/WIDESEAWCS_ISystemRepository.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/WIDESEAWCS_ISystemServices.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/WIDESEAWCS_ITaskInfoRepository.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/WIDESEAWCS_ITaskInfoService.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj

@@ -8,8 +8,8 @@

    <ItemGroup>
        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
        <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
        <PackageReference Include="WIDESEAWCS_Core" Version="1.0.6" />
        <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
        <PackageReference Include="WIDESEAWCS_Core" Version="1.0.24" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Modified_Date.json

@@ -1 +1 @@
{"MM":"1","LogTime":"2024-11-12"}
{"MM":"1","LogTime":"2025-05-21"}

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj

@@ -8,11 +8,6 @@
    </PropertyGroup>

    <ItemGroup>
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_TaskExecuteDetail.tsv" />
        <Content Remove="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Dictionary.tsv" />
@@ -30,21 +25,6 @@
    <ItemGroup>
        <EmbeddedResource Include="index.html">
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
        </EmbeddedResource>
        <EmbeddedResource Include="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv">
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -74,7 +54,7 @@

    <ItemGroup>
        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
        <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
        <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -10,9 +10,15 @@
  "AllowedHosts": "*",
  "ConnectionStringsEncryption": false,
  "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true
  //1.MySql
  //2.SqlServer
  //3.Sqlite
  //4.Oracle
  //5.PostgreSQL
  "DBType": "SqlServer", //数据库类型
  //连接字符串
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_ZH;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称
@@ -23,8 +29,13 @@
  },

  "WMS": "http://localhost:9290/api/Task/",

  "ApiName": "WIDESEA",
  "ApiLogIgnore": "WIDESEAWCS", //忽略的API名称，多个用逗号分隔
  "ApiName": "WIDESEAWCS",
  "ExpMinutes": 120,
  "QuartzJobAutoStart": true
  "QuartzJobAutoStart": false,//是否自动启动Job
  "LogDeubgEnable": true, //是否记录调试日志
  "PrintSql": true, //打印SQL语句
  "LogAOPEnable": true, //是否记录AOP日志
  "WebSocketEnable": true, //是否开启WebSocket服务
  "WebSocketPort": 9296 //WebSocket服务端口
}

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceInfo.tsv

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocol.tsv

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DeviceProtocolDetail.tsv

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_DispatchInfo.tsv

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/WIDESEAWCS_DB.DBSeed.Json/Dt_Router.tsv

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/WIDESEAWCS_SystemRepository.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/WIDESEAWCS_SystemServices.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/WIDESEAWCS_TaskInfoRepository.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/WIDESEAWCS_TaskInfoService.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj

@@ -7,8 +7,8 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.1" />
      <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.1.0" />
      <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.10" />
      <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
    </ItemGroup>

    <ItemGroup>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/config/buttons.js

@@ -93,17 +93,19 @@
    }
},
{
    name: "手 åŠ¨ å®Œ æˆ",
    icon: '',
    name: "完成任务",
    icon: 'el-icon-check',
    class: '',
    type: 'success',
    value: 'TaskHandCompleted',
    onClick: function () {
    }
},
{
    name: "取 æ¶ˆ ä»» åŠ¡",
    icon: '',
    name: "取消任务",
    icon: 'el-icon-delete',
    class: '',
    type: 'danger',
    value: 'TaskHandCancel',
    onClick: function () {
    }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/system/Sys_Role.js

@@ -27,7 +27,7 @@
    },
    onInit() {
      //设置treetable的唯一值字段(这个字段的值在表里面必须是唯一的)
      this.rowKey="Role_Id";
      // this.rowKey="Role_Id";
    },
    /***加载后台数据见Sys_RoleController.cs文件***/
    loadTreeChildren(tree, treeNode, resolve) { //加载子节点

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js

@@ -21,14 +21,14 @@
      if (TaskHandCancelBtn) {
        TaskHandCancelBtn.onClick = function () {
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) return this.$error("请选择数据!");
          if (rows.length > 1) return this.$error("请选择一条数据!");
          if (rows.length == 0) return this.$error("请选择需要取消任务!");
          if (rows.length > 1) return this.$error("请选择一条任务!");
          var param = rows[0].taskNum;
          this.http
            .post("api/Task/TaskCancel?taskNum="+param, "数据处理中...")
            .post("api/Task/TaskCancel?taskNum="+param, "任务处理中...")
            .then((x) => {
              if (x.status) {
                this.$Message.success('任务取消成功.');
                this.$Message.success('任务取消成功');
                this.refresh();
              } else {
                return this.$error(x.message);
@@ -40,14 +40,14 @@
      if (TaskHandCompletedBtn) {
        TaskHandCompletedBtn.onClick = function () {
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) return this.$error("请选择数据!");
          if (rows.length > 1) return this.$error("请选择一条数据!");
          if (rows.length == 0) return this.$error("请选择需要完成任务!");
          if (rows.length > 1) return this.$error("请选择一条任务!");
          var param = rows[0].taskNum;
          this.http
            .post("api/Task/TaskCompleted?taskNum="+param, "数据处理中...")
            .post("api/Task/TaskCompleted?taskNum="+param, "任务处理中...")
            .then((x) => {
              if (x.status) {
                this.$Message.success('任务手动完成');
                this.$Message.success('任务完成成功');
                this.refresh();
              } else {
                return this.$error(x.message);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue

@@ -133,13 +133,13 @@
        width: 150,
        align: "left",
      },
      {
        field: "areaType",
        title: "区域类型",
        type: "decimal",
        width: 90,
        align: "left",
      },
      // {
      //   field: "areaType",
      //   title: "区域类型",
      //   type: "decimal",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "areaStatus",
        title: "区域状态",
@@ -152,7 +152,7 @@
        field: "areaDes",
        title: "区域描述",
        type: "int",
        width: 120,
        width: 160,
        align: "left",
      },
      {
@@ -166,7 +166,7 @@
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        width: 120,
        align: "left",
        sort: true,
      },
@@ -174,24 +174,24 @@
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        width: 90,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        width: 120,
        align: "left",
        sort: true,
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
      // {
      //   field: "remark",
      //   title: "备注",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
    ]);
    const detail = ref({
      cnName: "#detailCnName",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue

@@ -143,13 +143,6 @@
        align: "left",
      },
      {
        field: "Remark",
        title: "备注",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue

@@ -29,7 +29,7 @@
    const editFormFields = ref({
      roadwayNo: "",
      areaId: "",
      enalbeStatus: "",
      enableStatus: "",
      deviceNo: "",
      inStationCode: "",
      inSCStationCode: "",
@@ -54,7 +54,7 @@
        {
          title: "禁用状态",
          required: true,
          field: "enalbeStatus",
          field: "enableStatus",
          type: "select",
          dataKey: "enableStatusEnum",
          data: [],

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/warehouse.vue

@@ -64,7 +64,7 @@
      [
        { title: "仓库编号", field: "warehouseCode", type: "like" },
        { title: "仓库名称", field: "warehouseName", type: "like" },
        { title: "仓库类型", field: "warehouseType", type: "like" },
        // { title: "仓库类型", field: "warehouseType", type: "like" },
        {
          title: "仓库状态",
          field: "warehouseStatus",
@@ -99,13 +99,13 @@
        width: 150,
        align: "left",
      },
      {
        field: "warehouseType",
        title: "仓库类型",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
      //   field: "warehouseType",
      //   title: "仓库类型",
      //   type: "string",
      //   width: 150,
      //   align: "left",
      // },
      {
        field: "warehouseStatus",
        title: "仓库状态",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue

@@ -87,7 +87,7 @@
    const searchFormOptions = ref([
      [
        { title: "角色名称", field: "roleName", type: "text" },
        { title: "部门ID", field: "deptId", type: "text" },
        // { title: "部门ID", field: "deptId", type: "text" },
        {
          dataKey: "enable",
          data: [],
@@ -135,7 +135,7 @@
        title: "部门ID",
        type: "int",
        width: 90,
        // hidden: true,
        hidden: true,
        align: "left",
      },
    //   {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue

@@ -50,16 +50,16 @@
          type: "cascader",
        },
      ],
      [
        {
          dataKey: "组织机构",
          data: [],
          title: "组织构架",
          field: "deptIds",
          colSize: 12,
          type: "treeSelect",
        },
      ],
      // [
      //   {
      //     dataKey: "组织机构",
      //     data: [],
      //     title: "组织构架",
      //     field: "deptIds",
      //     colSize: 12,
      //     type: "treeSelect",
      //   },
      // ],
      [
        {
          dataKey: "enable",
@@ -80,7 +80,7 @@
        },
      ],
      [{ title: "备注", field: "remark", colSize: 12, type: "textarea" }],
      [{ title: "头像", field: "headImageUrl", type: "img" }],
      // [{ title: "头像", field: "headImageUrl", type: "img" }],
    ]);
    const searchFormFields = ref({
      systemType: "0",
@@ -160,13 +160,13 @@
        width: 80,
        align: "left",
      },
      {
        field: "headImageUrl",
        title: "头像",
        type: "img",
        width: 90,
        align: "left",
      },
      // {
      //   field: "headImageUrl",
      //   title: "头像",
      //   type: "img",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "dept_Id",
        title: "不用",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/38b1c5dd-656a-4092-881f-3db66940307e.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/57ae96c1-5e57-4458-b620-36f3c051d823.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6f1437fd-2fc1-4910-9d5a-eb569aaa6efe.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9792178d-f937-4c06-9523-5ec0b82b8a84.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f92ea823-4793-428b-8373-4040362364da.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs

@@ -119,8 +119,8 @@
                                {
                                    locationInfo.Depth = 2;
                                }
                                locationInfo.LocationCode = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
                                locationInfo.LocationName = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}巷道{locationInfo.Row.ToString().PadLeft(3, '0')}行{locationInfo.Column.ToString().PadLeft(3, '0')}列{locationInfo.Layer.ToString().PadLeft(3, '0')}层{locationInfo.Depth.ToString().PadLeft(2, '0')}æ·±";
                                locationInfo.LocationCode = $"{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
                                locationInfo.LocationName = $"{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}巷道{locationInfo.Row.ToString().PadLeft(3, '0')}行{locationInfo.Column.ToString().PadLeft(3, '0')}列{locationInfo.Layer.ToString().PadLeft(3, '0')}层{locationInfo.Depth.ToString().PadLeft(2, '0')}æ·±";
                            }

                            locationInfos.Add(locationInfo);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs

@@ -23,6 +23,8 @@

        public override WebResponseContent AddData(SaveModel saveModel)
        {
            saveModel.MainData["warehouseType"] = 1;
            saveModel.MainData["warehouseStatus"] = 1;
            Dt_Warehouse warehouse = saveModel.MainData.DicToModel<Dt_Warehouse>();
            return base.AddData(warehouse);
        }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs

@@ -41,7 +41,7 @@
        [ImporterHeader(Name = "创建者")]
        [ExporterHeader(DisplayName = "创建者")]
        [SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "创建者")]
        public string Creater { get; set; }
        public string Creater { get; set; } = "System";

        /// <summary>
        /// åˆ›å»ºæ—¶é—´

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs

@@ -153,40 +153,11 @@
        /// </summary>
        [Description("入库任务异常")]
        InException = 299,

        /// <summary>
        /// æ–°å»ºç§»åº“任务
        /// </summary>
        [Description("新建移库任务")]
        RelocationNew = 300,

        /// <summary>
        /// ç§»åº“任务完成
        /// </summary>
        [Description("移库任务完成")]
        RelocationFinish = 310,

        /// <summary>
        /// ç§»åº“任务执行中
        /// </summary>
        [Description("移库任务执行中")]
        RelocationExecuting = 320,

        /// <summary>
        /// ç§»åº“任务取消
        /// </summary>
        [Description("移库任务取消")]
        RelocationCancel = 330,

        /// <summary>
        /// ç§»åº“任务异常
        /// </summary>
        [Description("移库任务异常")]
        RelocationException = 340,
    }

    #endregion å…¥åº“任务状态

    #region å‡ºåº“任务状态
    /// <summary>
    /// å‡ºåº“任务状态
    /// </summary>
@@ -228,16 +199,74 @@
        [Description("出库任务异常")]
        OutException = 199
    }
    #endregion

    #region ç§»åº“任务状态
    public enum RelocationTaskStatusEnum
    {

        /// <summary>
        /// æ–°å»ºç§»åº“任务
        /// </summary>
        [Description("新建移库任务")]
        RelocationNew = 300,

        /// <summary>
        /// ç§»åº“任务执行中
        /// </summary>
        [Description("移库任务执行中")]
        RelocationExecuting = 310,

        /// <summary>
        /// ç§»åº“任务完成
        /// </summary>
        [Description("移库任务完成")]
        RelocationFinish = 320,

        /// <summary>
        /// ç§»åº“任务取消
        /// </summary>
        [Description("移库任务取消")]
        RelocationCancel = 398,

        /// <summary>
        /// ç§»åº“任务异常
        /// </summary>
        [Description("移库任务异常")]
        RelocationException = 399,
    }
    #endregion

    #region AGV任务状态
    public enum AGVTaskStatusEnum
    {
        /// <summary>
        /// æ–°å»º
        /// </summary>
        [Description("新建")]
        AGV_New = 500,

        [Description("执行中")]
        /// <summary>
        /// AGV执行中
        /// </summary>
        [Description("AGV执行中")]
        AGV_Executing = 510,
        /// <summary>
        /// AGV完成
        /// </summary>
        [Description("AGV完成")]
        AGV_Finish = 520,

        [Description("完成")]
        AGV_Finish = 520
    }
        /// <summary>
        /// AGV任务取消
        /// </summary>
        [Description("AGV任务取消")]
        RelocationCancel = 598,

        /// <summary>
        /// AGV任务异常
        /// </summary>
        [Description("AGV任务异常")]
        RelocationException = 599,
    } 
    #endregion
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/ISys_DictionaryRepository.cs

@@ -4,12 +4,15 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.System;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.System;

namespace WIDESEA_ISystemRepository
{
    public interface ISys_DictionaryRepository : IRepository<Sys_Dictionary>
    {
        IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true);
        IEnumerable<VueDictionaryDTO> GetDictionaries(IEnumerable<string> dicNos, List<RoleNodes> roleNodes, bool executeSql = true);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs

@@ -17,7 +17,7 @@
        [SugarColumn(IsNullable = true, ColumnDescription = "区域主键")]
        public int AreaId {  get; set; }

        [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "货位编号")]
        [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "货位编号")]
        public string LocationCode {  get; set; }

        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "货位名称")]

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs

@@ -5,20 +5,126 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.System;
using WIDESEA_ISystemRepository;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.System;

namespace WIDESEA_SystemRepository
{
    public class Sys_DictionaryRepository : RepositoryBase<Sys_Dictionary>, ISys_DictionaryRepository
    {
        


        public Sys_DictionaryRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
        {
            

        }

        #region æŸ¥è¯¢æ•°æ®åº“select方法
        public class SourceKeyVaule
        {
            public int id { get; set; }
            public int parentId { get; set; }
            public string DicName { get; set; }
            public int DicValue { get; set; }
        }
        public IEnumerable<VueDictionaryDTO> GetDictionaries(IEnumerable<string> dicNos, List<RoleNodes> roleNodes, bool executeSql = true)
        {
            List<Sys_Dictionary> Dictionaries = GetAllDictionary();
            List<VueDictionaryDTO> DictionaryDTO = new List<VueDictionaryDTO>();


            foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
            {
                VueDictionaryDTO dictionaryDTO = new VueDictionaryDTO();
                dictionaryDTO.DicNo = item.DicNo;
                dictionaryDTO.Config = item.Config;
                dictionaryDTO.Data = item.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName });
                if (executeSql)
                {
                    //  2020.05.01增加根据用户信息加载字典数据源sql
                    string sql = item.Sql;
                    if (!string.IsNullOrEmpty(sql))
                    {
                        dictionaryDTO.Data = item.DicNo == "tree_roles" ?
                            QueryRole(GetCustomDBSql(item.DicNo, sql, roleNodes)).OrderBy(x => x.id).Select(list => new { id = list.id, parentId = list.parentId, key = list.DicValue, value = list.DicName }) : Query(GetCustomDBSql(item.DicNo, sql, roleNodes)).OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName });
                    }
                }
                DictionaryDTO.Add(dictionaryDTO);
            }
            return DictionaryDTO;
        }

        List<SourceKeyVaule> QueryRole(string sql)
        {
            try
            {
                return base.QueryDynamicDataBySql(sql, null).Select(s => new SourceKeyVaule()
                {
                    id = s.id,
                    parentId = s.parentId,
                    DicName = s.value,
                    DicValue = s.key
                }).ToList();
            }
            catch (Exception ex)
            {
                return new List<SourceKeyVaule>();
            }
        }
        /// <summary>
        /// èŽ·å–自定义数据源sql
        /// </summary>
        /// <param name="dicNo"></param>
        /// <param name="originalSql"></param>
        /// <returns></returns>
        public static string GetCustomDBSql(string dicNo, string originalSql, List<RoleNodes> roleNodes)
        {
            switch (dicNo)
            {
                case "roles":
                //2020.05.24增加绑定table表时，获取所有的角色列表
                //注意，如果是2020.05.24之前获取的数据库脚本
                //请在菜单【下拉框绑定设置】添加一个字典编号【t_roles】,除了字典编号，其他内容随便填写
                case "t_roles":
                case "tree_roles":
                    originalSql = GetRolesSql(originalSql, roleNodes);
                    break;
                default:
                    break;
            }
            return originalSql;
        }
        /// <summary>
        /// èŽ·å–解决的数据源，只能看到自己与下级所有角色
        /// </summary>
        /// <param name="context"></param>
        /// <param name="originalSql"></param>
        /// <returns></returns>
        public static string GetRolesSql(string originalSql, List<RoleNodes> roleNodes)
        {
            if (App.User.IsSuperAdmin)
            {
                return originalSql;
            }

            var RoleNodes = roleNodes.Where(x => x.Id == App.User.RoleId)
                   .Select(s => new RoleNodes()
                   {
                       Id = s.Id,
                       ParentId = 0,//将自己的角色作为root节点
                       RoleName = s.RoleName
                   }).ToList();
            List<int> roleIds = roleNodes.Select(x => x.Id).ToList();
            //roleIds.Add(App.User.RoleId);

            return originalSql = $@"SELECT RoleId as 'key',RoleId AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role 
                      WHERE Enable=1  and RoleId in ({string.Join(',', roleIds)})";
        }
        #endregion

        /// <summary>
        /// 
@@ -58,7 +164,7 @@
            }
            catch (Exception ex)
            {
                throw ex;
                return new List<Sys_DictionaryList>();
            }
        }


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs

@@ -25,11 +25,13 @@
    {
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ICacheService _cacheService;
        private readonly ISys_RoleService _sys_RoleService;

        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService) : base(BaseDal)
        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService) : base(BaseDal)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _cacheService = cacheService;
            _sys_RoleService = sys_RoleService;
        }

        public ISys_DictionaryRepository Repository => BaseDal;
@@ -54,6 +56,29 @@
            List<VueDictionaryDTO> vueDictionaryDTOs = new List<VueDictionaryDTO>();

            List<string> cacheDicNos = new List<string>();
            #region æŸ¥è¯¢æ•°æ®åº“下拉框数据
            if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
            {
                var selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x)), _sys_RoleService.GetAllChildren(App.User.RoleId));

                foreach (var item in selectDics)
                {
                    if (!_cacheService.Exists(item.DicNo))
                    {
                        vueDictionaryDTOs.Add(item);
                    }
                    else
                    {
                        VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(_cacheService.Get(item.DicNo));
                        if (vueDictionary != null && vueDictionary.Data.ToJson() != item.Data.ToJson())
                        {
                            vueDictionaryDTOs.Add(item);
                            _cacheService.AddOrUpdate(item.DicNo, item.Serialize());
                        }
                    }
                }
            }
            #endregion
            foreach (string n in dicNos)
            {
                string str = _cacheService.Get(n);
@@ -61,47 +86,13 @@
                {
                    VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);

                    if (vueDictionary != null)
                    if (vueDictionary != null && vueDictionaryDTOs.Where(x => x.DicNo == vueDictionary.DicNo).FirstOrDefault() == null)
                    {
                        vueDictionaryDTOs.Add(vueDictionary);
                        cacheDicNos.Add(n);
                    }
                }
            }
            if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
            {
                List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO
                {
                    DicNo = s.DicNo,
                    Config = s.Config,
                    //dbSql = s.Sql,
                    Data = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
                }).ToList();

                foreach (var item in selectDics)
                {
                    if (!_cacheService.Exists(item.DicNo))
                    {
                        _cacheService.Add(item.DicNo, item.Serialize());
                    }
                }
                vueDictionaryDTOs.AddRange(selectDics);
            }

            //object GetSourceData(string dicNo, string dbSql, object data)
            //{
            //    if (string.IsNullOrEmpty(dbSql))
            //    {
            //        return data;
            //    }
            //    return BaseDal.QueryObjectDataBySql(dbSql, null);
            //}
            //List<VueDictionaryDTO> vueDictionaryDTOs = dicConfig.Select(item => new VueDictionaryDTO
            //{
            //    DicNo = item.dicNo,
            //    Config = item.config,
            //    Data = GetSourceData(item.dicNo, item.dbSql, item.list)
            //}).ToList();

            try
            {
@@ -117,8 +108,9 @@

                        foreach (var item in dics)
                        {
                            if (dicList.Contains(item))
                                cusDics.Add(item);
                            dicList.Remove(item);
                            cusDics.Add(item);
                        }

                        foreach (var item in cusDics)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs

@@ -239,7 +239,7 @@
                    x.AuthValue = "";
                });
                //将取消的权限设置为""
                _RoleAuthRepository.UpdateData(delAuths);
                _RoleAuthRepository.DeleteData(delAuths);

                int addCount = updateAuths.Where(x => x.AuthId <= 0).Count();
                int updateCount = updateAuths.Where(x => x.AuthId > 0).Count();

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -352,7 +352,7 @@
                            Roadway = location.RoadwayNo,
                            SourceAddress = location.LocationCode,
                            TargetAddress = locationInfos.LocationCode,
                            TaskStatus = InTaskStatusEnum.RelocationNew.ObjToInt(),
                            TaskStatus = RelocationTaskStatusEnum.RelocationNew.ObjToInt(),
                            TaskType = TaskTypeEnum.Relocation.ObjToInt(),
                            Depth= location.Depth,
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -199,7 +199,7 @@
                }
                else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
                {
                    task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
                    task.TaskStatus = RelocationTaskStatusEnum.RelocationExecuting.ObjToInt();
                }
                else
                {
@@ -451,7 +451,7 @@

                _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);

                task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationFinish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();
@@ -647,7 +647,7 @@
                _basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
                _basicService.LocationInfoService.Repository.UpdateData(locationEnd);

                task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationCancel.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Log/System/APIÇëÇó/2025-05-28/ÈÎÎñÍê³É250528.txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
2025/5/28 10:55:04.16
请求异常
{"请求报文":"","接收报文":"","错误":"由于目标计算机积极拒绝，无法连接。 [::ffff:127.0.0.1]:9291 (localhost:9291)"}
-------------------------------


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json

@@ -12,7 +12,7 @@
  "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true
  //连接字符串
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_TEST;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ZH;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称

 ÏîÄ¿×ÊÁÏ/ÏîÄ¿Îļþ/ÖкÍÁ¢Ìå¿âºÍAGVÈí¼þϵͳÎÊÌâÇåµ¥£¨µÚ¶þ´Î¹µÍ¨£©-20204.08.06.xls

Binary files differ