yanjinhui
2026-03-19 33f55e3be906cbc0390e1ae7a20d6561dfc06140
添加平库前端页面
已添加5个文件
已修改5个文件
416 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/router/viewGird.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue 323 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
let extension = {
    components: {//动态扩充组件或组件路径
        //表单header、content、footer对应位置扩充的组件
        gridHeader:'',
        gridbody:'',
        gridFooter: '',
        //弹出框(修改、编辑、查看)header、content、footer对应位置扩充的组件
        modelHeader: '',
        modelBody: '',
        modelFooter: ''
    },
    buttons: [],//扩展的按钮
    methods: {//事件扩展
        onInit() {
        },
        onInited() {
        }
    }
};
export default extension;
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/router/viewGird.js
@@ -86,6 +86,11 @@
  path: '/trackloginfo',  
  name: 'trackloginfo',
  component: () => import('@/views/basicinfo/Dt_trackloginfo.vue')
},
{
  path: '/StationInfo',
  name: 'StationInfo',
  component: () => import('@/views/basicinfo/Dt_StationInfo.vue')
}
]
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,323 @@
<template>
  <view-grid
    ref="grid"
    :columns="columns"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>
<script>
import extend from "@/extension/basicinfo/Dt_trackloginfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "站台信息",
      name: "stationInfo",
      url: "/stationInfo/",
      sortName: "createDate",
    });
    const editFormFields = ref({
      id: "",
      stationCode: "",
      stationName: "",
      stationType: "",
      floorNumber: "",
      isOccupied: "",
      remark: "",
      creater: "",
      createDate: "",
      modifier: "",
      modifyDate: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "站台编号",
          field: "stationCode",
          type: "input",
          width: 220,
          require: true,
        },
        {
          title: "站台名称",
          field: "stationName",
          type: "input",
          width: 220,
          require: false,
        },
        {
          title: "站台类型",
          field: "stationType",
          type: "select",
          width: 150,
          require: true,
          data: [
            { key: "1", value: "只入" },
            { key: "2", value: "只出" },
            { key: "3", value: "可入可出" },
          ],
        },
        {
          title: "所在楼层",
          field: "floorNumber",
          type: "input",
          width: 150,
          require: true,
        },
      ],
      [
        {
          title: "站台状态",
          field: "isOccupied",
          type: "select",
          width: 150,
          require: true,
          data: [
            { key: "0", value: "空闲" },
            { key: "1", value: "占用" },
            { key: "2", value: "禁用" },
          ],
        },
        {
          title: "备注",
          field: "remark",
          type: "input",
          width: 400,
          require: false,
        },
      ],
      [
        {
          title: "主键ID",
          field: "id",
          type: "input",
          width: 100,
          hidden: true,
          readonly: true,
        },
        {
          title: "创建人",
          field: "creater",
          type: "input",
          width: 120,
          hidden: true,
          readonly: true,
        },
        {
          title: "创建时间",
          field: "createDate",
          type: "datetime",
          width: 150,
          hidden: true,
          readonly: true,
        },
        {
          title: "修改人",
          field: "modifier",
          type: "input",
          width: 120,
          hidden: true,
          readonly: true,
        },
        {
          title: "修改时间",
          field: "modifyDate",
          type: "datetime",
          width: 150,
          hidden: true,
          readonly: true,
        },
      ],
    ]);
    // æœç´¢è¡¨å•绑定字段
    const searchFormFields = ref({
      stationCode: "",
      stationName: "",
      stationType: "",
      floorNumber: "",
      isOccupied: "",
      creater: "",
      createDate: "",
    });
    // æœç´¢è¡¨å•布局配置项
    const searchFormOptions = ref([
      [
        {
          title: "站台编号",
          field: "stationCode",
          type: "like"
        },
        {
          title: "站台名称",
          field: "stationName",
          type: "like"
        },
        {
          title: "所在楼层",
          field: "floorNumber",
          type: "like"
        },
      ],
      [
        {
          title: "站台类型",
          field: "stationType",
          type: "select",
          data: [
            { key: "1", value: "只入" },
            { key: "2", value: "只出" },
            { key: "3", value: "可入可出" },
          ],
        },
        {
          title: "站台状态",
          field: "isOccupied",
          type: "select",
          data: [
            { key: "0", value: "空闲" },
            { key: "1", value: "占用" },
            { key: "2", value: "禁用" },
          ],
        },
      ],
      [
        {
          title: "创建人",
          field: "creater",
          type: "like"
        },
        {
          title: "创建时间",
          field: "createDate",
          type: "datetime"
        },
      ],
    ]);
    // è¡¨æ ¼åˆ—配置 - 1:1 å¯¹åº”后端Dt_StationInfo实体所有字段+公共字段
    const columns = ref([
      {
        field: "id",
        title: "序号",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
      },
      {
        field: "stationCode",
        title: "站台编号",
        type: "string",
        width: 140,
        align: "left",
        require: true,
      },
      {
        field: "stationName",
        title: "站台名称",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "stationType",
        title: "站台类型",
        type: "select",
        width: 120,
        align: "left",
        bind: {
          key: "value",
          data: [
            { key: "1", value: "只入" },
            { key: "2", value: "只出" },
            { key: "3", value: "可入可出" },
          ],
        },
      },
      {
        field: "floorNumber",
        title: "所在楼层",
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "isOccupied",
        title: "站台状态",
        type: "select",
        width: 120,
        align: "left",
        bind: {
          key: "value",
          data: [
            { key: "0", value: "空闲" },
            { key: "1", value: "占用" },
            { key: "2", value: "禁用" },
          ],
        },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 200,
        align: "left",
      },
    ]);
    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns
    };
  },
});
</script>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue
@@ -183,8 +183,8 @@
    // æœç´¢è¡¨å•布局配置项
    const searchFormOptions = ref([
      [
        { title: "仓库编号", field: "warehouseId", type: "equal" },
        { title: "货位编号", field: "locationCode", type: "like" },
        { title: "仓库编号", field: "warehouseId", type: "equal" },
        { title: "货位名称", field: "locationName", type: "like" },
        
      ],
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue
@@ -185,8 +185,8 @@
    // æœç´¢è¡¨å•布局配置项
    const searchFormOptions = ref([
      [
        { title: "仓库编号", field: "warehouseId", type: "equal" },
        { title: "货位编号", field: "locationCode", type: "like" },
        { title: "仓库编号", field: "warehouseId", type: "equal" },
        { title: "货位名称", field: "locationName", type: "like" },
        
      ],
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs
@@ -51,7 +51,7 @@
                {
                    FreeLocationInfos = FreeLocationInfos.Where(x => !LocationCodes.Contains(x.LocationCode)).ToList();
                    var rGVLocationInfos = FreeLocationInfos.Where(x => x.WarehouseId == locationInfo.WarehouseId).ToList();//查找同区域可用空货位
                    rGVLocationInfo = GetFreeLocationInfo(rGVLocationInfos);
                    rGVLocationInfo = GetFreeLocationInfo(rGVLocationInfos);//获取可用空货位
                    if (rGVLocationInfo == null)
                    {
                        rGVLocationInfos = FreeLocationInfos.Where(x => x.WarehouseId != locationInfo.WarehouseId).ToList();//查找不同区域可用空货位
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_BasicInfoService
{
    public class StationInfoService : ServiceBase<Dt_StationInfo, IRepository<Dt_StationInfo>>, IStationInfoService
    {
        public StationInfoService(IRepository<Dt_StationInfo> BaseDal) : base(BaseDal)
        {
        }
        public IRepository<Dt_StationInfo> Repository => BaseDal;
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_IBasicInfoService
{
    public interface IStationInfoService : IService<Dt_StationInfo>
    {
        public IRepository<Dt_StationInfo> Repository { get; }
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Server.Controllers.BasicInfo
{
    /// <summary>
    ///接口信息
    /// </summary>
    [Route("api/StationInfo")]
    [ApiController]
    public class StationInfoController : ApiBaseController<IStationInfoService, Dt_StationInfo>
    {
        public StationInfoController(IStationInfoService service) : base(service)
        {
        }
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs
@@ -175,6 +175,7 @@
                #region å®žä½“类转换
                hIKROBOTTaskSubmit = HIKROBOTTask(task);
                if (hIKROBOTTaskSubmit == null) throw new Exception("海康AGV任务实体转换失败");
                var json = hIKROBOTTaskSubmit.Serialize();
                #endregion
                string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskSubmit.Serialize());
                hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
@@ -209,7 +210,7 @@
            HIKROBOTTaskSubmit hIKROBOTTaskSubmit = new HIKROBOTTaskSubmit();
            try
            {
                var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType);
                var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType-1);
                hIKROBOTTaskSubmit.initPriority = task.Grade;
                hIKROBOTTaskSubmit.robotTaskCode = task.WMSTaskNum;