From 33f55e3be906cbc0390e1ae7a20d6561dfc06140 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 19 三月 2026 10:10:22 +0800
Subject: [PATCH] 添加平库前端页面
---
代码管理/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js | 20 ++
代码管理/WCS/WIDESEAWCS_Client/src/router/viewGird.js | 5
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs | 16 ++
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue | 323 ++++++++++++++++++++++++++++++++++++++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs | 2
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue | 2
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs | 21 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs | 22 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs | 3
10 files changed, 412 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js"
new file mode 100644
index 0000000..76c1328
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/basicinfo/StationInfo.js"
@@ -0,0 +1,20 @@
+let extension = {
+ components: {//鍔ㄦ�佹墿鍏呯粍浠舵垨缁勪欢璺緞
+ //琛ㄥ崟header銆乧ontent銆乫ooter瀵瑰簲浣嶇疆鎵╁厖鐨勭粍浠�
+ gridHeader:'',
+ gridbody:'',
+ gridFooter: '',
+ //寮瑰嚭妗�(淇敼銆佺紪杈戙�佹煡鐪�)header銆乧ontent銆乫ooter瀵瑰簲浣嶇疆鎵╁厖鐨勭粍浠�
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ buttons: [],//鎵╁睍鐨勬寜閽�
+ methods: {//浜嬩欢鎵╁睍
+ onInit() {
+ },
+ onInited() {
+ }
+ }
+};
+export default extension;
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/router/viewGird.js"
index ea245bb..727663b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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')
}
]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue"
new file mode 100644
index 0000000..ef3060d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue"
index d16b582..1921ecb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/hKLocationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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" },
],
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue"
index 0b13bc2..b3c71b9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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" },
],
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
index abb818a..7057215 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/RGVLocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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();//鏌ユ壘涓嶅悓鍖哄煙鍙敤绌鸿揣浣�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs"
new file mode 100644
index 0000000..8566b4e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/StationInfoService.cs"
@@ -0,0 +1,21 @@
+锘縰sing 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;
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs"
new file mode 100644
index 0000000..29f08ef
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IStationInfoService.cs"
@@ -0,0 +1,16 @@
+锘縰sing 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; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs"
new file mode 100644
index 0000000..7e2f703
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/StationInfoController.cs"
@@ -0,0 +1,22 @@
+锘縰sing 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)
+ {
+
+ }
+
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
index c7a6a39..17ddab6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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;
--
Gitblit v1.9.3