From 37051424de7c4a97132fbb06e45df594790aabf9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 16 十二月 2025 18:40:38 +0800
Subject: [PATCH] 优化功能
---
项目代码/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs | 148 +++
项目资料/接口汇总文件/WMS接口对接文档20251216_V1.1.3.docx | 0
项目代码/WCSServices/WIDESEAWCS_BasicInfoService/LocationStatusChangeRecordService.cs | 8
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 13
项目代码/WCSClient/src/api/http.js | 2
项目代码/WCSClient/config/buttons.js | 17
项目代码/WCSServices/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs | 14
项目代码/WCSServices/WIDESEAWCS_Server/appsettings.json | 3
/dev/null | 0
项目代码/WCSClient/src/views/basicinfo/locationInfoRow.vue | 386 +++++++++++
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/BasicInfo/LocationInfoController.cs | 30
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/WebAPIController.cs | 8
项目代码/WCSServices/WIDESEAWCS_Tasks/一期线体/ConveyorLineJob1.cs | 15
项目代码/WCSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue | 23
项目代码/WCSClient/src/views/Home.vue | 1202 +++++++++--------------------------
项目代码/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 10
项目代码/WCSServices/WIDESEAWCS_DTO/WMSResponseContent.cs | 50 +
项目代码/WCSServices/WIDESEAWCS_Tasks/二期线体/ConveyorLineJob2.cs | 6
项目代码/WCSServices/WIDESEAWCS_IBasicInfoService/ILocationStatusChangeRecordService.cs | 2
项目代码/WCSServices/WIDESEAWCS_DTO/EPLightSendDTO.cs | 2
项目代码/WCSServices/WIDESEAWCS_Common/APIEnum/APIEnum.cs | 5
项目代码/WCSServices/WIDESEAWCS_Tasks/AGV/AGVExtend.cs | 2
22 files changed, 1,008 insertions(+), 938 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/config/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/config/buttons.js"
index 50c4dfd..6e21fbe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/config/buttons.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/config/buttons.js"
@@ -136,6 +136,23 @@
onClick: function () {
this.export();
}
+},{
+ name: "鍚� 鐢�",
+ icon: '',
+ class: '',
+ value: 'Enable',
+ type: 'primary',
+ onClick: function () {
+ }
+},
+{
+ name: "绂� 鐢�",
+ icon: '',
+ class: '',
+ value: 'Disable',
+ type: 'danger',
+ onClick: function () {
+ }
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/api/http.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/api/http.js"
index 4358160..ede3598 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/api/http.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/api/http.js"
@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://11.2.30.112:9291/';
+ axios.defaults.baseURL = 'http://127.0.0.1:9291/';
//axios.defaults.baseURL = 'http://192.168.35.3:9281/';
}
else if (process.env.NODE_ENV == 'debug') {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
index f6f59be..272c9bf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
@@ -15,7 +15,15 @@
</el-alert>
<div>
<el-input
- placeholder="璇疯緭鍏ュ瘑鐮�"
+ placeholder="璇疯緭鍏ユ棫瀵嗙爜"
+ v-model="oldpwd"
+ size="large"
+ style="width: 100%; margin-top: 15px"
+ />
+ </div>
+ <div>
+ <el-input
+ placeholder="璇疯緭鍏ユ柊瀵嗙爜"
v-model="password"
size="large"
style="width: 100%; margin-top: 15px"
@@ -44,25 +52,28 @@
data() {
return {
row: {},
+ oldpwd: "",
password: "",
model: false,
};
},
methods: {
open(row) {
+ this.oldpwd = "";
this.password = "";
this.row = row;
this.model = true;
},
savePwd() {
- if (!this.password) return this.$Message.error("璇疯緭瀵嗙爜");
+ if (!this.oldpwd) return this.$Message.error("璇疯緭鏃у瘑鐮�");
+ if (!this.password) return this.$Message.error("璇疯緭鏂板瘑鐮�");
if (this.password.length < 6)
return this.$Message.error("瀵嗙爜闀垮害鑷冲皯6浣�");
let url =
- "/api/user/modifyUserPwd?password=" +
- this.password +
- "&userName=" +
- this.row.UserName;
+ "/api/user/modifyPwd?oldPwd=" +
+ this.oldpwd +
+ "&newPwd=" +
+ this.password;
this.http.post(url, {}, true).then((x) => {
if (!x.status) {
return this.$message.error(x.message);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/Home.vue"
index c6990e4..962a6e8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/Home.vue"
@@ -1,890 +1,342 @@
<template>
- <div class="title">
- <!-- <el-row :gutter="20" style="height:85%">
- <el-col :span="8">
- <span style="position: relative; top: 100px;left: 30px;">
- <h4>涓�妤艰澶囩洃鎺�</h4>
- </span>
- <el-row :gutter="20" style="height:1000px">
- <el-col :span="8">
- <div>
- <div v-for="(group, index) in groupedLines(linescopy7)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 118px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy8)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 115px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy9)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 112px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy10)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- <div style="margin-top: 109px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy11)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- <div style="margin-top: 107px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy12)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- </div>
- </el-col>
-
- <el-col :span="8">
- <div>
- <div v-for="(group, index) in groupedLines(linescopy1)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 108px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy2)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 58px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy3)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition"
- url="api/Equipment/GetLineInfoByNo" />
- </div>
- </div>
- <div style="margin-top: 58px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy4)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- <div style="margin-top: 115px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy5)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- <div style="margin-top: 115px;"></div>
- <div v-for="(group, index) in groupedLines(linescopy6)" :key="index">
- <div class="positionY-group">
- <LineInfoCopy v-for="(line, lineIndex) in group.lines" :key="lineIndex"
- :equipNo="line.equipNo" :imgType="line.imgType" :positionX="line.positionX"
- :positionY="line.positionY" :condition="line.condition" />
- </div>
- </div>
- </div>
- </el-col>
- </el-row>
-
- </el-col>
- <el-col :span="8">
- <div style="position: relative; top: 50px;">
- <div class="stackerDiv">
- <div class="stackDivName">涓�鍙峰爢鍨涙満</div>
- <LineComponent :x="xValue1" ref="stacker1" :equipNo="SC01"></LineComponent>
- </div>
- <el-divider></el-divider>
- <div class="stackerDiv">
- <div class="stackDivName">浜屽彿鍫嗗灈鏈�</div>
- <LineComponent :x="xValue2" ref="stacker2" :equipNo="SC02"></LineComponent>
- </div>
- <el-divider></el-divider>
- <div class="stackerDiv">
- <div class="stackDivName">涓夊彿鍫嗗灈鏈�</div>
- <LineComponent :x="xValue3" ref="stacker3" :equipNo="SC03"></LineComponent>
- </div>
- <el-divider></el-divider>
- <div class="stackerDiv">
- <div class="stackDivName">鍥涘彿鍫嗗灈鏈�</div>
- <LineComponent :x="xValue4" ref="stacker4" :equipNo="SC04"></LineComponent>
- </div>
- <el-divider></el-divider>
- <div class="stackerDiv">
- <div class="stackDivName">浜斿彿鍫嗗灈鏈�</div>
- <LineComponent :x="xValue5" ref="stacker5" :equipNo="SC05"></LineComponent>
- </div>
- <el-divider></el-divider>
- <div class="stackerDiv">
- <div class="stackDivName">鍏彿鍫嗗灈鏈�</div>
- <LineComponent :x="xValue6" ref="stacker6" :equipNo="SC06"></LineComponent>
- </div>
- </div>
- </el-col>
- </el-row> -->
- </div>
-
-</template>
-
-<script>
-import { onMounted, ref, reactive } from "vue";
-import LineInfo from "./LineInfo.vue";
-import LineInfoCopy from "./LineInfocopy.vue";
-import LineComponent from './LineComponent.vue';
-import JElDescription from "./JElDescription";
-import { useWebSocket } from '@/uitils/websocket';
-
-export default {
- data() {
- return {
- ws: null, // WebSocket瀹炰緥
- messages: [], // 娑堟伅鍒楄〃
- status: { // 杩炴帴鐘舵��
- isConnected: false,
- error: null
- },
- linescopy1: [
- {
- equipNo: "1005",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1006",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1007",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1008",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy2: [
- {
- equipNo: "1009",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1010",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1011",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1025",
- imgType: "1",
- positionX: 0.6,
- positionY: 21,
- condition: false,
- },
- {
- equipNo: "1012",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy3: [
- {
- equipNo: "1017",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1018",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1019",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1026",
- imgType: "1",
- positionX: 0.6,
- positionY: 21,
- condition: false,
- },
- {
- equipNo: "1020",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy4: [
- {
- equipNo: "1021",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1022",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1023",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1024",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy5: [
- {
- equipNo: "1031",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1032",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1033",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1034",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy6: [
- {
- equipNo: "1035",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1036",
- imgType: "1",
- positionX: 0.6,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1037",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1038",
- imgType: "1",
- positionX: 0.6,
- positionY: 20,
- condition: false,
- }
- ],
- linescopy7: [
- {
- equipNo: "1001",
- imgType: "1",
- positionX: 5,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1002",
- imgType: "1",
- positionX: 5,
- positionY: 8,
- condition: false,
- },
-
- {
- equipNo: "1003",
- imgType: "1",
- positionX: 5,
- positionY: 20,
- condition: false,
- },
- {
- equipNo: "1004",
- imgType: "1",
- positionX: 5,
- positionY: 20,
- condition: false,
- },
- ],
- linescopy8: [
- {
- equipNo: "1039",
- imgType: "1",
- positionX: 6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1040",
- imgType: "1",
- positionX: 6,
- positionY: 16,
- condition: false,
- },
- ],
- linescopy9: [
- {
- equipNo: "1013",
- imgType: "1",
- positionX: 6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1014",
- imgType: "1",
- positionX: 6,
- positionY: 16,
- condition: false,
- },
- ],
- linescopy10: [
- {
- equipNo: "1015",
- imgType: "1",
- positionX: 6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1016",
- imgType: "1",
- positionX: 6,
- positionY: 16,
- condition: false,
- },
- ],
- linescopy11: [
- {
- equipNo: "1027",
- imgType: "1",
- positionX: 6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1028",
- imgType: "1",
- positionX: 6,
- positionY: 16,
- condition: false,
- },
-
- ],
- linescopy12: [
- {
- equipNo: "1029",
- imgType: "1",
- positionX: 6,
- positionY: 8,
- condition: false,
- },
- {
- equipNo: "1030",
- imgType: "1",
- positionX: 6,
- positionY: 16,
- condition: false,
- },
- ],
+ <div class="container">
+ <div class="content-wrapper">
+ <!-- 鎺у埗闈㈡澘鍖哄煙 -->
+ <!-- <div class="form-group">
+ <label>鍖哄煙锛�</label>
+ <el-select
+ size="mini"
+ filterable
+ v-model="Area.shelf_code"
+ placeholder="璇烽�夋嫨"
+ class="full-width"
+ >
+ <el-option
+ v-for="item in slectData"
+ :value="item.shelf_code"
+ :label="item.house_name"
+ :key="item.house_name"
+ ></el-option>
+ </el-select>
+ </div> -->
+
+ <div class="form-group">
+ <div style="display:flex;flex-direction: column;">
+ <h4>璐т綅鎺�</h4>
+ <el-select
+ size="mini"
+ @change="SCChange"
+ v-model="Area.tunnel"
+ placeholder="璇烽�夋嫨鎺�"
+ class="full-width"
+ >
+ <el-option
+ v-for="item in scList"
+ :value="item"
+ :label="'绗�'+item+'鎺�'"
+ :key="item"
+ ></el-option>
+ </el-select>
+ <el-button type="success" class="refresh-btn" @click="GetViewData">
+ 鍒锋柊
+ </el-button>
+ </div>
- StackerCrane: {
- Automatic: "",
- Fault: "",
- CurrentLayer: "",
- CurrentRow: "1",
- CurrentColumn: "",
- CurrentTaskNum: "",
- Running: "",
- DeviceName: "",
- DeviceCOde: "",
- StackerAlarm: "",
- },
- RGVFirst: false,
- RGVSecond: false,
- RGVThird: false,
- xValue1: 0,
- xValue2: 0,
- xValue3: 0,
- xValue4: 0,
- xValue5: 0,
- xValue6: 0,
- timer1: null, // 瀹氭椂鍣ㄥ彉閲�
- timer2: null, // 瀹氭椂鍣ㄥ彉閲�
- RGV01: {
- Automatic: "",
- Fault: "",
- LevelPoint: 0,
- CurrentTaskNum: "",
- Running: "",
- DeviceName: "",
- DeviceCode: "RGV01",
- Alarm: "",
- },
- RGV02: {
- Automatic: "",
- Fault: "",
- LevelPoint: 1280,
- CurrentTaskNum: "",
- Running: "",
- DeviceName: "",
- DeviceCode: "RGV02",
- Alarm: "",
- },
- RGV03: {
- Automatic: "",
- Fault: "",
- LevelPoint: 0,
- CurrentTaskNum: "",
- Running: "",
- DeviceName: "",
- DeviceCode: "RGV03",
- Alarm: "",
- },
- formRGV: {
- TaskType: "",
- SourceAddress: "",
- TargetAddress: "",
- DeviceCode: "",
- },
- };
- },
- components: {
- LineInfoCopy,
- LineInfo,
- LineComponent,
- JElDescription,
- },
- methods: {
- groupedLines(linescopy) {
- const groups = {};
- linescopy.forEach((line) => {
- const positionY = line.positionY;
- if (!groups[positionY]) {
- groups[positionY] = {
- positionY,
- lines: [],
- };
- }
- groups[positionY].lines.push(line);
- });
- return Object.values(groups);
- },
- mouseClickRGVFirst() {
- this.fullscreenLoading = true;
- this.RGVFirst = true;
- this.fullscreenLoading = false;
- },
- mouseClickSecond() {
- this.fullscreenLoading = true;
- this.RGVSecond = true;
- this.fullscreenLoading = false;
- },
- mouseClickThird() {
- this.fullscreenLoading = true;
- this.RGVThird = true;
- this.fullscreenLoading = false;
- },
- SendCommand(x) {
- this.fullscreenLoading = true;
- this.formRGV.DeviceCode = x;
- this.http.post("api/DeviceInfo/RGVHandTask", this.formRGV)
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
- $vue.refresh();
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
- RGVReset(x) {
- this.fullscreenLoading = true;
- this.http.post("api/DeviceInfo/RGVReset?DeviceCode=" + x, null, "")
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
-
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
- RGVemergencyStop(x) {
- this.fullscreenLoading = true;
- this.http.post("api/DeviceInfo/RGVemergencyStop?DeviceCode=" + x, null, "")
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
-
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
- RGVPause(x) {
- this.fullscreenLoading = true;
- this.http.post("api/DeviceInfo/RGVPause?DeviceCode=" + x, null, "")
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
- RGVCancel(x) {
- this.fullscreenLoading = true;
- this.http.post("api/DeviceInfo/RGVCancel?DeviceCode=" + x, null, "")
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
- RGVInitialize(x) {
- this.fullscreenLoading = true;
- this.http.post("api/DeviceInfo/RGVInitialize?DeviceCode=" + x, null, "")
- .then((x) => {
- if (!x.status) {
- this.$message.error(x.message);
- } else {
- this.$Message.success(x.message);
- }
- })
- .finally(() => {
- this.fullscreenLoading = false;
- });
- },
+ <div class="legend-section" style="margin-left: 20px;">
+ <h4>璇存槑</h4>
+ <div class="legend-grid">
+ <div
+ class="legend-item"
+ v-for="item in infoMsg"
+ :key="item.bgcolor"
+ >
+ <span
+ class="color-box"
+ :style="{ 'background-color': item.bgcolor }"
+ ></span>
+ <span class="legend-label">{{ item.msg }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 璐т綅灞曠ず鍖哄煙 -->
+ <div class="location-view">
+ <div
+ class="layer-container"
+ v-for="(item,index) in locationData"
+ :key="index"
+ >
+ <h3 class="layer-title">绗瑊{ item.layer }}灞�</h3>
+ <div class="row" >
+ <div
+ class="location-cell"
+ :style="{ 'background-color': GetBgColor(column) }"
+ v-for="(column,index) in item.locationObj" :key="index"
+ @mouseenter="showTooltip(column, $event)"
+ @mouseleave="hideTooltip"
+ >
+ {{ column.row }}-{{ column.column }}-{{ column.layer }}
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鎮诞鎻愮ず妗� -->
+ <div
+ v-if="showTooltipFlag"
+ class="location-tooltip"
+ :style="{
+ left: tooltipPosition.x + 'px',
+ top: tooltipPosition.y + 'px',
+ }"
+ >
+ <div v-if="currentLocation">
+ <p><strong>璐т綅鍙�:</strong>{{ currentLocation.locationCode }}</p>
+ <p><strong>鏂欑鍙�:</strong>{{ currentLocation.barCode ? currentLocation.barCode :"鏃犳枡绠�" }}</p>
+ <p>
+ <strong>鎺掑垪灞�:</strong> {{ currentLocation.row }}鎺抺{
+ currentLocation.column
+ }}鍒梴{ currentLocation.layer }}灞�
+ </p>
+ <p><strong>鐘舵��:</strong> {{ getStatusText(currentLocation) }}</p>
+ <!-- <p>
+ <strong>绂佺敤:</strong>
+ {{ currentLocation.location_lock == 3 ? "鏄�" : "鍚�" }}
+ </p> -->
+ <!-- <p v-if="currentLocation.location_state > 0">
+ <strong>鐗╂枡缂栫爜:</strong>
+ {{ currentLocation.material_code || "鏃�" }}
+ </p>
+ <p v-if="currentLocation.location_state > 0">
+ <strong>鏁伴噺:</strong> {{ currentLocation.quantity || "鏃�" }}
+ </p> -->
+ </div>
+ </div>
+ </div>
+ </template>
+
+ <script>
+ import { ElButton } from "element-plus";
+import { el } from 'element-plus/es/locale';
+
+ export default {
+ data() {
+ return {
+ slectData: [],
+ scList: [],
+ Area: { house_name: "", tunnel: "", shelf_code: "" },
+ mian_height: "",
+ infoMsg: [
+ { bgcolor: "lightgreen", msg: "绌洪棽", state: 0 },
+ { bgcolor: "orange", msg: "鏈夎揣", state: 100 },
+ { bgcolor: "#2BB3D5", msg: "閿佸畾", state: 1 },
+ ],
+ locationData: [],
+ showTooltipFlag: false,
+ currentLocation: null,
+ tooltipPosition: { x: 0, y: 0 },
+ };
},
computed: {
-
+ GetBgColor() {
+ return (col) => {
+ var bgColor = "";
+ //浼樺厛鏄剧ず绂佺敤鐘舵��
+ if (col.location_lock > 0) {
+ this.infoMsg.forEach((el) => {
+ if (el.state === col.location_lock) {
+ bgColor = el.bgcolor;
+ }
+ });
+ }
+ else{
+ return "lightgreen";
+ }
+ return bgColor;
+ };
+ },
+ },
+ methods: {
+ GetViewData() {
+ var _this = this;
+ this.http
+ .post("/api/LocationInfo/GetLocationStatus?row=" + _this.Area.tunnel, {}, "鏌ヨ涓�")
+ .then((x) => {
+ _this.locationData = x.data;
+ });
+ },
+ // 鍒囨崲鎺�
+ SCChange() {
+ this.GetViewData();
+ },
+ showTooltip(location, event) {
+ this.currentLocation = location;
+ this.showTooltipFlag = true;
+
+ // 璁剧疆鎻愮ず妗嗕綅缃紝绋嶅井鍋忕Щ閬垮厤閬尅榧犳爣
+ this.tooltipPosition = {
+ x: event.clientX + 10,
+ y: event.clientY + 10,
+ };
+ },
+
+ hideTooltip() {
+ this.showTooltipFlag = false;
+ this.currentLocation = null;
+ },
+
+ getStatusText(location) {
+ // if (location.location_lock === 3) return "绂佺敤";
+ if (location.location_lock === 0) return "绌洪棽";
+ if (location.location_lock === 1) return "閿佸畾";
+ if (location.location_lock === 100) return "鏈夎揣";
+ // if (location.location_state > 0 && location.location_state < 100)
+ // return "閿佸畾";
+ return "鍏朵粬";
+ },
},
mounted() {
+ var mainHeight = document.getElementById("vol-main");
+ this.mian_height = mainHeight.offsetHeight - 40 + "px";
+ var _this = this;
+ //鍔犺浇涓嬫媺閫夐」
+ this.http.post("/api/LocationInfo/GetRow", {}, "鏌ヨ涓�").then((x) => {
+ //鍔犺浇绗竴涓尯鍩燂紝绗竴鎺�
+ // _this.Area.shelf_code = _this.slectData[0].shelf_code;
+ _this.scList = x.data;
+ _this.Area.tunnel = _this.scList[0];
+ _this.GetViewData();
+ });
},
- created() {
-
- this.ws = new WebSocket('ws://localhost:9260/');
-
- this.ws.onmessage = (event) => {
- try {
- const data = JSON.parse(event.data);
- console.log('鏀跺埌娑堟伅:', data);
- // 澶勭悊娑堟伅...
- } catch (e) {
- console.error('娑堟伅瑙ｆ瀽澶辫触', e);
- }
- };
- const stackerComponentsMap = {
- "SC01": 'stacker1',
- "SC02": 'stacker2',
- "SC03": 'stacker3',
- "SC04": 'stacker4',
- "SC05": 'stacker5',
- "SC06": 'stacker6',
- };
- // const componentKey = stackerComponentsMap[data.R_PP_Status];
- // if (componentKey) {
- // this.StackerCrane.Automatic = data;
- // this.StackerCrane.Fault = data;
- // this.StackerCrane.Running = data;
- // this.StackerCrane.CurrentColumn = data;
- // this.StackerCrane.CurrentLayer = data;
- // this.StackerCrane.LevelPoint = data;
- // this.StackerCrane.DeviceName = data;
- // this.StackerCrane.DeviceCode = data;
- // this.StackerCrane.CurrentTaskNum = data;
- // this.StackerCrane.StackerAlarm = data;
-
- // this.$nextTick(() => {
- // this.$refs[componentKey].moveDot(this.StackerCrane);
- // });
- // }
- const stationMap = {
- "SC011F": this.linescopy1,
- "SC021F": this.linescopy2,
- "SC031F": this.linescopy3,
- "SC041F": this.linescopy4,
- "SC051F": this.linescopy5,
- "SC061F": this.linescopy6,
- "SC071F": this.linescopy7,
- "SC081F": this.linescopy8,
- "SC091F": this.linescopy9,
- "SC101F": this.linescopy10,
- "SC111F": this.linescopy11,
- "SC121F": this.linescopy12,
- "SC012F": this.linescopy13,
- "SC022F": this.linescopy13,
- "SC032F": this.linescopy13,
- "SC042F": this.linescopy13,
- "SC052F": this.linescopy13,
- "SC062F": this.linescopy13,
- "SC072F": this.linescopy13,
- "SC082F": this.linescopy14,
- };
-
- // var station = eventData.stationChildCode;
- // if (stationMap[eventData.roadway]) {
- // stationMap[eventData.roadway].forEach((line) => {
- // if (line.equipNo === station) {
- // line.condition = eventData.inStock;
- // }
- // })
- // }
- },
-};
-</script>
-
-<style scoped>
-/* .positionY-group {
- margin-bottom: 10px;
-} */
-.title {
- height: 1800px;
-}
-
-.cardWidth {
+ components: { ElButton },
+ };
+ </script>
+
+ <style scoped>
+ .container {
+ display: flex;
+ flex-direction: column;
height: 100%;
- width: 100%;
- box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-}
-
-.cardWidthrow {
- height: 00%;
- width: 100%;
- /* margin-top: 10px; */
- box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-}
-
-.divider {
- top: 50px;
-}
-
-.layerSize {
- position: absolute;
- top: 100px;
- left: 30px;
- color: fuchsi
-}
-
-.stackerDiv {
- border: 1px solid rgba(0, 195, 255, 0.822);
- width: 980px;
- padding-left: 3px;
-}
-
-.stackDivName {
+ padding: 10px;
+ }
+
+ .header {
text-align: center;
- color: rgba(0, 195, 255, 0.822);
- margin-bottom: 12px;
-}
-
-.dot-Running {
- position: absolute;
- top: -5px;
- width: 20px;
- height: 20px;
- border-radius: 50%;
- background-color: #409eff;
- transition: transform 0.3s ease;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 9px;
+ margin-bottom: 20px;
+ }
+
+ .title {
+ font-size: 20px;
font-weight: bold;
- color: white;
-}
-
-.dot-Automatic {
- position: absolute;
- top: -5px;
- width: 20px;
- height: 20px;
- border-radius: 50%;
- background-color: #0df705;
- transition: transform 0.3s ease;
+ margin: 0;
+ }
+
+ .content-wrapper {
display: flex;
- justify-content: center;
- align-items: center;
- font-size: 9px;
- font-weight: bold;
- color: white;
-}
-
-.dot-Fault {
- position: absolute;
- top: -5px;
- width: 20px;
- height: 20px;
- /* right:0px; */
- border-radius: 50%;
- background-color: #f80410;
- transition: transform 0.3s ease;
+ flex: 1;
+ min-height: 0;
+ padding: 10px;
+ }
+
+
+
+ .full-width {
+ width: 100%;
+ }
+
+ .refresh-btn {
+ margin-top: 10px;
+ width: 35%;
+ }
+
+
+ .legend-section h4 {
+ margin-bottom: 10px;
+ }
+
+ .legend-grid {
display: flex;
- justify-content: center;
+ grid-template-columns: 1fr;
+ gap: 8px;
+ }
+
+ .legend-item {
+ display: flex;
align-items: center;
- font-size: 9px;
- font-weight: bold;
- color: white;
-}
-
-
-.line-container {
- position: relative;
- height: 1280px;
- background-color: #ecf5ff;
+ }
+
+ .color-box {
+ display: inline-block;
width: 20px;
- top: 30px;
- left: 200px
-}
-
-.RGVline {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: 2px;
- background-color: #a0cfff;
-}
-
-.line {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: 2px;
- background-color: #a0cfff;
-}
-
-.line-containerThird {
- position: absolute;
height: 20px;
- background-color: #ecf5ff;
- width: 1330px;
- /* margin-top:180px; */
- top: 180px;
-
- left: 300px;
-}
-
-.lineThird {
- /* position: absolute; */
- height: 1px;
- /* margin-top:180px; */
- background-color: #a0cfff;
-}</style>
\ No newline at end of file
+ margin-right: 8px;
+ border-radius: 3px;
+ }
+
+ .legend-label {
+ font-size: 13px;
+ }
+
+ .location-view {
+ flex: 1;
+ overflow: auto;
+ padding: 10px;
+ background-color: white;
+ border-radius: 4px;
+ }
+
+ .layer-container {
+ margin-bottom: 25px;
+ }
+
+ .layer-title {
+ margin: 0 0 10px 0;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 8px;
+ cursor: pointer;
+ }
+
+ .location-cell {
+ width: 66px;
+ height: 38px;
+ margin: 3px;
+ text-align: center;
+ font-size: 14px;
+ border-radius: 3px;
+ line-height: 38px;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+ }
+
+ .location-tooltip {
+ position: fixed;
+ z-index: 9999;
+ background-color: white;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 10px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+ pointer-events: none;
+ max-width: 250px;
+ }
+
+ .location-tooltip p {
+ margin: 5px 0;
+ font-size: 13px;
+ line-height: 1.4;
+ }
+
+ .location-tooltip strong {
+ display: inline-block;
+ width: 70px;
+ color: #666;
+ }
+ .form-group{
+ display: flex;
+ }
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/basicinfo/locationInfoRow.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/basicinfo/locationInfoRow.vue"
new file mode 100644
index 0000000..5060660
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSClient/src/views/basicinfo/locationInfoRow.vue"
@@ -0,0 +1,386 @@
+<template>
+ <div class="container">
+ <div class="header">
+ <h2 class="title">璐т綅鎺掑浘</h2>
+ </div>
+
+ <div class="content-wrapper">
+ <!-- 鎺у埗闈㈡澘鍖哄煙 -->
+ <div class="control-panel">
+ <div class="form-group">
+ <label>鍖哄煙锛�</label>
+ <el-select
+ size="mini"
+ filterable
+ v-model="Area.shelf_code"
+ placeholder="璇烽�夋嫨"
+ class="full-width"
+ >
+ <el-option
+ v-for="item in slectData"
+ :value="item.shelf_code"
+ :label="item.house_name"
+ :key="item.house_name"
+ ></el-option>
+ </el-select>
+ </div>
+
+ <div class="form-group">
+ <label>鎺掞細</label>
+ <el-select
+ size="mini"
+ clearable
+ filterable
+ @change="SCChange"
+ v-model="Area.tunnel"
+ placeholder="璇烽�夋嫨"
+ class="full-width"
+ >
+ <el-option
+ v-for="item in scList"
+ :value="item"
+ :label="item"
+ :key="item"
+ ></el-option>
+ </el-select>
+ </div>
+
+ <el-button type="success" class="refresh-btn" @click="GetViewData">
+ 鍒锋柊
+ </el-button>
+
+ <div class="legend-section">
+ <h4>璇存槑</h4>
+ <div class="legend-grid">
+ <div
+ class="legend-item"
+ v-for="item in infoMsg"
+ :key="item.bgcolor"
+ >
+ <span
+ class="color-box"
+ :style="{ 'background-color': item.bgcolor }"
+ ></span>
+ <span class="legend-label">{{ item.msg }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- 璐т綅灞曠ず鍖哄煙 -->
+ <div class="location-view">
+ <div
+ class="layer-container"
+ v-for="layer in locationData"
+ :key="layer.index"
+ >
+ <h3 class="layer-title">绗瑊{ layer.index }}灞�</h3>
+ <div class="row" v-for="row in layer.rows" :key="row.index">
+ <div
+ class="location-cell"
+ :style="{ 'background-color': GetBgColor(col) }"
+ v-for="col in row.cols"
+ :key="col.index"
+ @mouseenter="showTooltip(col, $event)"
+ @mouseleave="hideTooltip"
+ >
+ {{ row.index }}-{{ col.index }}-{{ layer.index }}
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鎮诞鎻愮ず妗� -->
+ <div
+ v-if="showTooltipFlag"
+ class="location-tooltip"
+ :style="{
+ left: tooltipPosition.x + 'px',
+ top: tooltipPosition.y + 'px',
+ }"
+ >
+ <div v-if="currentLocation">
+ <p><strong>璐т綅鍙�:</strong>{{ currentLocation.locationCode }}</p>
+ <p>
+ <strong>璐т綅鎺掑垪灞�:</strong> {{ currentLocation.row }}鎺抺{
+ currentLocation.index
+ }}鍒梴{ currentLocation.layer }}灞�
+ </p>
+ <p><strong>鐘舵��:</strong> {{ getStatusText(currentLocation) }}</p>
+ <p>
+ <strong>绂佺敤:</strong>
+ {{ currentLocation.location_lock == 3 ? "鏄�" : "鍚�" }}
+ </p>
+ <!-- <p v-if="currentLocation.location_state > 0">
+ <strong>鐗╂枡缂栫爜:</strong>
+ {{ currentLocation.material_code || "鏃�" }}
+ </p>
+ <p v-if="currentLocation.location_state > 0">
+ <strong>鏁伴噺:</strong> {{ currentLocation.quantity || "鏃�" }}
+ </p> -->
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import { ElButton } from "element-plus";
+
+export default {
+ data() {
+ return {
+ slectData: [],
+ scList: [],
+ Area: { house_name: "", tunnel: "", shelf_code: "" },
+ mian_height: "",
+ infoMsg: [
+ { bgcolor: "lightgreen", msg: "绌鸿揣浣�", state: 0 },
+ { bgcolor: "orange", msg: "鏈夎揣", state: 100 },
+ { bgcolor: "#2BB3D5", msg: "閿佸畾", state: "InAssigned" },
+ { bgcolor: "#ccc", msg: "绂佺敤", state: 3 },
+ // { bgcolor: "red", msg: "绂佺敤", state: 3 },
+ { bgcolor: "#b7ba6b", msg: "鍏跺畠", state: "else" },
+ ],
+ locationData: [],
+ showTooltipFlag: false,
+ currentLocation: null,
+ tooltipPosition: { x: 0, y: 0 },
+ };
+ },
+ computed: {
+ GetBgColor() {
+ return (col) => {
+ var bgColor = "#b7ba6b";
+ //浼樺厛鏄剧ず绂佺敤鐘舵��
+ if (col.location_lock == 3) {
+ this.infoMsg.forEach((el) => {
+ if (el.state == col.location_lock) {
+ bgColor = el.bgcolor;
+ }
+ });
+ } else {
+ this.infoMsg.forEach((el) => {
+ if (col.location_state > 0 && col.location_state < 100) {
+ if (el.state == "InAssigned") {
+ bgColor = el.bgcolor;
+ }
+ } else if (el.state == col.location_state) {
+ bgColor = el.bgcolor;
+ }
+ });
+ }
+ return bgColor;
+ };
+ },
+ },
+ watch: {
+ //鍒囨崲搴撳尯
+ "Area.shelf_code"(newValue, oldValue) {
+ this.scList = [];
+ this.slectData.forEach((e) => {
+ if (e.shelf_code == newValue) {
+ this.Area.tunnel = e.tunnel[0];
+ this.scList = e.tunnel;
+ }
+ });
+ this.GetViewData();
+ },
+ },
+ methods: {
+ GetViewData() {
+ var _this = this;
+ this.http
+ .post("/api/LocationInfoRow/GetLocationStatu", _this.Area, "鏌ヨ涓�")
+ .then((x) => {
+ _this.locationData = x;
+ console.log("鍚庣杩斿洖:", x);
+ });
+ },
+ // 鍒囨崲鎺�
+ SCChange() {
+ this.GetViewData();
+ },
+ showTooltip(location, event) {
+ this.currentLocation = location;
+ this.showTooltipFlag = true;
+
+ // 璁剧疆鎻愮ず妗嗕綅缃紝绋嶅井鍋忕Щ閬垮厤閬尅榧犳爣
+ this.tooltipPosition = {
+ x: event.clientX + 10,
+ y: event.clientY + 10,
+ };
+ },
+
+ hideTooltip() {
+ this.showTooltipFlag = false;
+ this.currentLocation = null;
+ },
+
+ getStatusText(location) {
+ // if (location.location_lock === 3) return "绂佺敤";
+ if (location.location_state === 0) return "绌鸿揣浣�";
+ if (location.location_state === 1) return "閿佸畾";
+ if (location.location_state === 10) return "鏈夎揣閿佸畾";
+ if (location.location_state === 20) return "绌洪棽閿佸畾";
+ if (location.location_state === 99) return "澶ф墭鐩橀攣瀹�";
+ if (location.location_state === 100) return "鏈夎揣";
+ // if (location.location_state > 0 && location.location_state < 100)
+ // return "閿佸畾";
+ return "鍏朵粬";
+ },
+ },
+ mounted() {
+ var mainHeight = document.getElementById("vol-main");
+ this.mian_height = mainHeight.offsetHeight - 40 + "px";
+ var _this = this;
+ //鍔犺浇涓嬫媺閫夐」
+ this.http.get("/api/LocationInfoRow/GetArea", {}, "鏌ヨ涓�").then((x) => {
+ _this.slectData = x;
+ //鍔犺浇绗竴涓尯鍩燂紝绗竴鎺�
+ _this.Area.shelf_code = _this.slectData[0].shelf_code;
+ _this.scList = _this.slectData[0].tunnel;
+ });
+ },
+ components: { ElButton },
+};
+</script>
+
+<style scoped>
+.container {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ padding: 10px;
+}
+
+.header {
+ text-align: center;
+ margin-bottom: 20px;
+}
+
+.title {
+ font-size: 20px;
+ font-weight: bold;
+ margin: 0;
+}
+
+.content-wrapper {
+ display: flex;
+ flex: 1;
+ min-height: 0;
+}
+
+.control-panel {
+ width: 220px;
+ padding: 15px;
+ background-color: #f5f7fa;
+ border-radius: 4px;
+ margin-right: 15px;
+ display: flex;
+ flex-direction: column;
+}
+
+.form-group {
+ margin-bottom: 15px;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.refresh-btn {
+ margin-top: 10px;
+ width: 100%;
+}
+
+.legend-section {
+ margin-top: 30px;
+}
+
+.legend-section h4 {
+ margin-bottom: 10px;
+}
+
+.legend-grid {
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: 8px;
+}
+
+.legend-item {
+ display: flex;
+ align-items: center;
+}
+
+.color-box {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ margin-right: 8px;
+ border-radius: 3px;
+}
+
+.legend-label {
+ font-size: 13px;
+}
+
+.location-view {
+ flex: 1;
+ overflow: auto;
+ padding: 10px;
+ background-color: white;
+ border-radius: 4px;
+}
+
+.layer-container {
+ margin-bottom: 25px;
+}
+
+.layer-title {
+ margin: 0 0 10px 0;
+ font-size: 16px;
+ color: #333;
+}
+
+.row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 8px;
+ cursor: pointer;
+}
+
+.location-cell {
+ width: 66px;
+ height: 38px;
+ margin: 3px;
+ text-align: center;
+ font-size: 14px;
+ border-radius: 3px;
+ line-height: 38px;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.location-tooltip {
+ position: fixed;
+ z-index: 9999;
+ background-color: white;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 10px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+ pointer-events: none;
+ max-width: 250px;
+}
+
+.location-tooltip p {
+ margin: 5px 0;
+ font-size: 13px;
+ line-height: 1.4;
+}
+
+.location-tooltip strong {
+ display: inline-block;
+ width: 70px;
+ color: #666;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationStatusChangeRecordService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationStatusChangeRecordService.cs"
index 2e59271..c7c5390 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationStatusChangeRecordService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationStatusChangeRecordService.cs"
@@ -50,7 +50,7 @@
/// <summary>
/// 璐т綅鍙樺姩璁板綍娣诲姞(澶氫釜)
/// </summary>
- public void AddLocationStatusChangeRecord(List<Dt_LocationInfo> locationInfos, LocationStatusEnum lastStatus, LocationStatusEnum newStatus, LocationChangeType changeType, List<int>? taskNums = null)
+ public void AddLocationStatusChangeRecord(List<Dt_LocationInfo> locationInfos, LocationStatusEnum lastStatus, LocationStatusEnum newStatus, LocationChangeType changeType, List<Dt_Task>? tasks = null)
{
try
{
@@ -58,7 +58,7 @@
for (int i = 0; i < locationInfos.Count; i++)
{
Dt_LocationInfo locationInfo = locationInfos[i];
- int? taskNum = (taskNums != null && taskNums.Count > 0 && taskNums.Count == locationInfos.Count) ? taskNums[i] : null;
+ Dt_Task? task = tasks.FirstOrDefault(x=>x.SourceAddress== locationInfo.LocationCode);
Dt_LocationStatusChangeRecord locationStatusChangeRecord = new Dt_LocationStatusChangeRecord()
{
AfterStatus = newStatus.ObjToInt(),
@@ -66,14 +66,12 @@
ChangeType = changeType.ObjToInt(),
LocationCode = locationInfo.LocationCode,
LocationId = locationInfo.Id,
- TaskNum = taskNum,
+ TaskNum = task.TaskNum,
Creater = "",
CreateDate = DateTime.Now,
};
records.Add(locationStatusChangeRecord);
}
-
-
BaseDal.AddData(records);
}
catch (Exception ex)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Common/APIEnum/APIEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Common/APIEnum/APIEnum.cs"
index 5c487af..f8152d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Common/APIEnum/APIEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Common/APIEnum/APIEnum.cs"
@@ -30,6 +30,11 @@
[Description("WMS鏂欑鍒拌揪鎷ｉ�変綅涓婃姤")]
WMSPickArrivedUp,
/// <summary>
+ /// WMS鎾澧欎笂鎶�
+ /// </summary>
+ [Description("WMS鎾澧欎笂鎶�")]
+ WMSLightBack,
+ /// <summary>
/// 浜屾湡鎾澧欏垵濮嬪寲
/// </summary>
[Description("浜屾湡鎾澧欏垵濮嬪寲")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/EPLightSendDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/EPLightSendDTO.cs"
index 88ff6ed..87e8ed2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/EPLightSendDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/EPLightSendDTO.cs"
@@ -25,7 +25,7 @@
/// </summary>
public int QUANTITY { get; set; }
/// <summary>
- /// 浜伅棰滆壊
+ /// 浜伅棰滆壊 1:钃濊壊 2:缁胯壊 3:娴呯豢 4:绾㈣壊 5:绱壊 6:榛勮壊 7:鐧借壊
/// </summary>
public string LIGHTCOLOR { get; set; }
/// <summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
index 12aa1f8..4fe800c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
@@ -127,4 +127,18 @@
/// </summary>
public int Mode { get; set; }
}
+ /// <summary>
+ /// 鎾澧欒繑鍥�
+ /// </summary>
+ public class TaskBackLight
+ {
+ /// <summary>
+ /// 鎾澧欑紪鍙�(B1涓�鏈�/B2浜屾湡鎾澧�)
+ /// </summary>
+ public string TagNo { get; set;}
+ /// <summary>
+ /// 璐т綅鍙�
+ /// </summary>
+ public string TagCode { get; set; }
+ }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/WMSResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/WMSResponseContent.cs"
index d02f463..86eeb02 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/WMSResponseContent.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_DTO/WMSResponseContent.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Core;
namespace WIDESEA_External.Model
{
@@ -24,4 +25,53 @@
/// </summary>
public object Data { get; set; }
}
+ public class BinCodeObj
+ {
+ public string Bincode { get; set; }
+ }
+ public class WMSReceiveTaskContent
+ {
+ public bool Status { get; set; }
+
+ public int Code { get; set; }
+
+ public string Message { get; set; }
+
+ public List<BinCodeObj> SucessData { get; set; }
+
+ public List<BinCodeObj> FailData { get; set; }
+
+ public static WMSReceiveTaskContent Instance => new WMSReceiveTaskContent();
+
+ public WMSReceiveTaskContent()
+ {
+ SucessData=new List<BinCodeObj>();
+ FailData=new List<BinCodeObj>();
+ }
+
+ public WMSReceiveTaskContent(bool status)
+ {
+ Status = status;
+ }
+
+ public WMSReceiveTaskContent OK()
+ {
+ Status = true;
+ return this;
+ }
+
+ public WMSReceiveTaskContent OK(string message = null)
+ {
+ Status = true;
+ Message = message;
+ return this;
+ }
+
+ public WMSReceiveTaskContent Error(string message = null)
+ {
+ Status = false;
+ Message = message;
+ return this;
+ }
+ }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_IBasicInfoService/ILocationStatusChangeRecordService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_IBasicInfoService/ILocationStatusChangeRecordService.cs"
index 1335a9b..8fcf4b1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_IBasicInfoService/ILocationStatusChangeRecordService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_IBasicInfoService/ILocationStatusChangeRecordService.cs"
@@ -22,7 +22,7 @@
/// <summary>
/// 璐т綅鍙樺姩璁板綍娣诲姞(澶氫釜)
/// </summary>
- void AddLocationStatusChangeRecord(List<Dt_LocationInfo> locationInfos, LocationStatusEnum lastStatus, LocationStatusEnum newStatus, LocationChangeType changeType, List<int>? taskNums = null);
+ void AddLocationStatusChangeRecord(List<Dt_LocationInfo> locationInfos, LocationStatusEnum lastStatus, LocationStatusEnum newStatus, LocationChangeType changeType, List<Dt_Task>? tasks = null);
/// <summary>
/// 鑾峰彇鎸囧畾璐т綅鍙樺姩璁板綍
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 9d49e37..4c6e163 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -23,6 +23,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_DTO.Agv;
+using WIDESEA_External.Model;
using WIDESEAWCS_Common.APIEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -57,7 +58,7 @@
/// </summary>
/// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- WebResponseContent ReceiveWMSTask([NotNull] WMSTaskDTO taskDTO);
+ WMSReceiveTaskContent ReceiveWMSTask([NotNull] WMSTaskDTO taskDTO);
/// <summary>
/// 鎾澧欏垵濮嬪寲
/// </summary>
@@ -77,7 +78,7 @@
/// 瀹瑰櫒鍏ュ簱鍒涘缓浠诲姟
/// </summary>
/// <returns></returns>
- WebResponseContent ContainerFlow(ContainerFlowDTO containerFlowDTO,string deviceCode,string stationCode);
+ WebResponseContent ContainerFlow(ContainerFlowDTO containerFlowDTO,string deviceCode,string stationCode,int type=0);
/// <summary>
/// 鐢宠鍏ュ簱
/// </summary>
@@ -152,6 +153,11 @@
/// <returns></returns>
WebResponseContent TaskCompleted(int taskNum);
/// <summary>
+ /// 浜屾湡鎾澧欏洖浼�
+ /// </summary>
+ /// <returns></returns>
+ EPLightContent WMSLightBack(List<TaskBackLight> taskBackLights);
+ /// <summary>
/// 浜屾湡鎾澧欎笅鍙�
/// </summary>
/// <param name="lightSendDTOs"></param>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/BasicInfo/LocationInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/BasicInfo/LocationInfoController.cs"
index 6e4f8d5..9e305c3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/BasicInfo/LocationInfoController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/BasicInfo/LocationInfoController.cs"
@@ -68,6 +68,34 @@
{
return Service.LocationDisableStatus(keys); ;
}
-
+ [HttpPost,HttpGet , Route("GetLocationStatus")]
+ public WebResponseContent GetLocationStatus(int row)
+ {
+ List<int> layers = _repository.QueryData(x => x.Row == row).Select(x => x.Layer).Distinct().ToList();
+ List<object> listObj=new List<object>();
+ foreach (var item in layers)
+ {
+
+ object locationObj = _repository.QueryData(x => x.Row == row && x.Layer== item).OrderBy(x => x.Columns).Select(x => new
+ {
+ barCode = x.PalletCode,
+ layer=x.Layer.ToString().PadLeft(2, '0'),
+ row=x.Row.ToString().PadLeft(2, '0'),
+ column = x.Columns.ToString().PadLeft(2, '0'),
+ locationCode = x.LocationCode,
+ location_lock=x.LocationStatus
+ }).ToList();
+ object obj = new { layer=item, locationObj };
+ listObj.Add(obj);
+ }
+
+ return WebResponseContent.Instance.OK("鎴愬姛", listObj);
+ }
+ [HttpPost, HttpGet, Route("GetRow")]
+ public WebResponseContent GetRow()
+ {
+ List<int> listRow=_repository.QueryData().Select(x=>x.Row).Distinct().ToList();
+ return WebResponseContent.Instance.OK("鎴愬姛",listRow);
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index f34f16d..c9c8a7e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Text;
+using WIDESEA_External.Model;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
@@ -33,7 +34,7 @@
}
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public WebResponseContent ReceiveWMSTask([FromBody] WMSTaskDTO taskDTO)
+ public WMSReceiveTaskContent ReceiveWMSTask([FromBody] WMSTaskDTO taskDTO)
{
return Service.ReceiveWMSTask(taskDTO);
}
@@ -81,11 +82,11 @@
byte[] bytesPick = commonConveyorLine.Communicator.Read("2", 5);
string PickBarCode = Encoding.UTF8.GetString(bytesPick).Replace("\0", "").Replace("\\0", "");
if (containerFlowDTO.ContainerCode != PickBarCode) throw new Exception($"浼犲叆鏂欑鐮亄containerFlowDTO.ContainerCode}锛岃緭閫佹枡绠辩爜{PickBarCode}鏁版嵁閿欒");
- if (containerFlowDTO.Direction == "100")
- {
- WebResponseContent responseContent = Service.ContainerFlow(containerFlowDTO, stationManger.StationDeviceCode, stationManger.PickStationCode);
- if (!responseContent.Status) throw new Exception(responseContent.Message);
- }
+ //if (containerFlowDTO.Direction == "100")
+ //{
+ // WebResponseContent responseContent = Service.ContainerFlow(containerFlowDTO, stationManger.StationDeviceCode, stationManger.PickStationCode);
+ // if (!responseContent.Status) throw new Exception(responseContent.Message);
+ //}
commonConveyorLine.Communicator.Write("22", (containerFlowDTO.Direction == "100" ? new byte[] { 1, 0 } : new byte[] { 2, 0 }));
}
else
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/WebAPIController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/WebAPIController.cs"
index 40a56db..ea003e7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/WebAPIController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/WebAPIController.cs"
@@ -15,6 +15,7 @@
using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.Agv;
+using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -59,7 +60,12 @@
{
return content.Error("浼犲叆涓嶈兘涓虹┖");
}
- content.OK("鎺ユ敹鎴愬姛");
+ List<TaskBackLight> taskBackLights = lightBackDTOs.Select(x => new TaskBackLight()
+ {
+ TagNo="B2",
+ TagCode=x.LOCATION,
+ }).ToList();
+ content = _taskService.WMSLightBack(taskBackLights);
}
catch (Exception ex)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/appsettings.json"
index 3c3f3c1..cededc3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/appsettings.json"
@@ -12,10 +12,7 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_HF;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_HF;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
index c3526ee..4dc25f7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -104,22 +104,17 @@
/// </summary>
/// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent ReceiveWMSTask([NotNull] WMSTaskDTO taskDTO)
+ public WMSReceiveTaskContent ReceiveWMSTask([NotNull] WMSTaskDTO taskDTO)
{
- WebResponseContent content = new WebResponseContent();
+ WMSReceiveTaskContent content = new WMSReceiveTaskContent();
string errorMsg = "";
try
{
lock (lock_taskReceive)
{
List<Dt_Task> tasks = new List<Dt_Task>();
- Dt_Task taskOld = BaseDal.QueryFirst(x=> taskDTO.Tasks.Select(x => x.TaskDescribe.ContainerCode).Contains(x.PalletCode));
- if (taskOld != null) throw new Exception($"鏂欑{taskOld.PalletCode}"+(taskOld.TaskType == TaskTypeEnum.Inbound.ObjToInt() ? "鍏ュ簱浠诲姟宸插瓨鍦�" : "鍑哄簱浠诲姟宸插瓨鍦�"));
+ List<Dt_Task> taskOlds = BaseDal.QueryData(x=> taskDTO.Tasks.Select(x => x.TaskDescribe.ContainerCode).Contains(x.PalletCode));
List<Dt_LocationInfo> locationInfos = _locationInfoRepository.GetCanOut(taskDTO.Tasks.Select(x=>x.TaskDescribe.ContainerCode).ToList());
-
- Dt_LocationInfo? noOutLocation = locationInfos.FirstOrDefault(x=>x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() || x.EnableStatus != EnableStatusEnum.Normal.ObjToInt());
-
- if (noOutLocation != null) throw new Exception($"鏂欑{noOutLocation.PalletCode}璐т綅{noOutLocation.LocationCode}鐘舵�佷笉鍙嚭搴�");
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData();
//涓嬪彂浠诲姟缁�
string taskGroup= taskDTO.TaskGroupCode.IsNullOrEmpty() ? Guid.NewGuid().ToString().Replace("-","") : taskDTO.TaskGroupCode;
@@ -129,16 +124,28 @@
//鑾峰彇鎿嶄綔鍙�
Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.PickStationCode == item.TaskDescribe.ToStationCode);
if (stationManger == null) throw new Exception($"浠诲姟{item.TaskCode}鍑哄簱鐩爣鎿嶄綔鍙皗item.TaskDescribe.ToStationCode}涓嶅瓨鍦�");
-
+ Dt_Task? taskOld = taskOlds.FirstOrDefault(x=>x.PalletCode==item.TaskDescribe.ContainerCode);
+ if (taskOld != null)
+ {
+ errorMsg += $"鏂欑{taskOld.PalletCode}" + (taskOld.TaskType == TaskTypeEnum.Inbound.ObjToInt() ? "鍏ュ簱浠诲姟宸插瓨鍦�;" : "鍑哄簱浠诲姟宸插瓨鍦�;");
+ content.FailData.Add(new BinCodeObj() { Bincode = item.TaskDescribe.ContainerCode });
+ continue;
+ }
Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.PalletCode == item.TaskDescribe.ContainerCode);
if (locationInfo == null)
{
errorMsg += $"鏂欑{item.TaskDescribe.ContainerCode}涓嶅瓨鍦�;";
+ content.FailData.Add(new BinCodeObj() { Bincode = item.TaskDescribe.ContainerCode });
continue;
};
-
+ Dt_LocationInfo? noOutLocation = locationInfos.FirstOrDefault(x => (x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() || x.EnableStatus != EnableStatusEnum.Normal.ObjToInt()) && x.PalletCode == item.TaskDescribe.ContainerCode);
+ if (noOutLocation != null)
+ {
+ errorMsg += $"鏂欑{noOutLocation.PalletCode}璐т綅{noOutLocation.LocationCode}鐘舵�佷笉鍙嚭搴�";
+ content.FailData.Add(new BinCodeObj() { Bincode = noOutLocation.PalletCode });
+ continue;
+ }
Dt_Task task = _mapper.Map<Dt_Task>(item);
-
task.SourceAddress = locationInfo.LocationCode;
task.CurrentAddress = locationInfo.LocationCode;
task.NextAddress = stationManger.PickStationCode;
@@ -149,6 +156,7 @@
task.DeviceCode = stationManger.CraneCode;
task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
tasks.Add(task);
+ content.SucessData.Add(new BinCodeObj() { Bincode = item.TaskDescribe.ContainerCode });
}
locationInfos.ForEach(x =>
@@ -161,8 +169,11 @@
_locationInfoRepository.UpdateData(locationInfos);
_unitOfWorkManage.CommitTran();
_taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
- _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.InStock, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, tasks.Select(x => x.TaskNum).ToList());
- content = tasks.Count > 0 ? content.OK("鎴愬姛!"+(errorMsg.IsNullOrEmpty()? "": errorMsg)) : content.Error("澶辫触");
+ if (tasks.Count>0)
+ {
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.InStock, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, tasks);
+ }
+ content.OK(errorMsg.IsNullOrEmpty()? "鎴愬姛": errorMsg);
}
}
catch (Exception ex)
@@ -176,7 +187,7 @@
/// 瀹瑰櫒鍏ュ簱鍒涘缓浠诲姟
/// </summary>
/// <returns></returns>
- public WebResponseContent ContainerFlow(ContainerFlowDTO containerFlowDTO, string deviceCode, string stationCode)
+ public WebResponseContent ContainerFlow(ContainerFlowDTO containerFlowDTO, string deviceCode, string stationCode, int type = 0)
{
WebResponseContent content = new WebResponseContent();
try
@@ -184,13 +195,27 @@
List<Dt_LocationInfo> locationInfos = _locationInfoRepository.QueryData();
Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.PalletCode == containerFlowDTO.ContainerCode);
if (locationInfo != null) throw new Exception($"搴撲綅鏂欑鍙穥containerFlowDTO.ContainerCode}宸插瓨鍦�");
- if (BaseDal.QueryFirst(x => x.PalletCode == containerFlowDTO.ContainerCode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.TaskState == TaskStatusEnum.CL_Executing.ObjToInt() && x.DeviceCode== deviceCode) != null)
+ Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == containerFlowDTO.ContainerCode);
+ if (taskOld !=null && taskOld.PalletCode == containerFlowDTO.ContainerCode && taskOld.TaskType == TaskTypeEnum.Inbound.ObjToInt() && taskOld.TaskState == TaskStatusEnum.CL_Executing.ObjToInt() && taskOld.DeviceCode == deviceCode)
{
return content.OK();
}
- else if(BaseDal.QueryFirst(x => x.PalletCode == containerFlowDTO.ContainerCode) != null)
+ if (taskOld != null && taskOld.PalletCode == containerFlowDTO.ContainerCode && taskOld.TaskType == TaskTypeEnum.Inbound.ObjToInt() && taskOld.TaskState == TaskStatusEnum.CL_Executing.ObjToInt() && taskOld.DeviceCode != deviceCode)
{
- throw new Exception($"鏂欑鍙穥containerFlowDTO.ContainerCode}浠诲姟宸插瓨鍦�");
+ Dt_StationManger stationOld = _stationMangerRepository.QueryFirst(x => x.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt() && x.StationDeviceCode == deviceCode);
+ string oldSlotCode = taskOld.SourceAddress;
+ taskOld.SourceAddress = containerFlowDTO.SlotCode;
+ taskOld.CurrentAddress = containerFlowDTO.SlotCode;
+ taskOld.NextAddress = stationOld.StationCode;
+ taskOld.DeviceCode = stationOld.StationDeviceCode;
+ //鏇存柊浠诲姟
+ BaseDal.UpdateData(taskOld);
+ _taskExecuteDetailService.AddTaskExecuteDetail(new List<int>() { taskOld.TaskNum }, $"{oldSlotCode}鎹㈣嚦{containerFlowDTO.SlotCode}鍏ュ簱");
+ return content.OK();
+ }
+ else if(taskOld != null)
+ {
+ throw new Exception($"鏂欑鍙穥containerFlowDTO.ContainerCode}" + (taskOld.TaskType == TaskTypeEnum.Inbound.ObjToInt() ? "鍏ュ簱AGV鎵ц涓�": "鍑哄簱AGV鎵ц涓�"));
}
Dt_LocationInfo? noInLocation = locationInfos.FirstOrDefault(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt());
if (noInLocation == null) throw new Exception($"鍙敤璐т綅涓嶈冻!");
@@ -207,9 +232,17 @@
task.Roadway = noInLocation.RoadwayNo;
task.DeviceCode = stationManger.StationDeviceCode;
task.TaskState = TaskStatusEnum.CL_Executing.ObjToInt();
+
//娣诲姞浠诲姟
BaseDal.AddData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(new List<int>() { task.TaskNum }, "鍒涘缓鍏ュ簱浠诲姟");
+ if (type > 0)
+ {
+ _taskExecuteDetailService.AddTaskExecuteDetail(new List<int>() { task.TaskNum }, "鎵嬪姩鎸夐挳鍏ュ簱");
+ }
+ else
+ {
+ _taskExecuteDetailService.AddTaskExecuteDetail(new List<int>() { task.TaskNum }, "鍒涘缓鍏ュ簱浠诲姟");
+ }
content.OK("鎴愬姛");
}
catch (Exception ex)
@@ -265,7 +298,36 @@
WebResponseContent content = new WebResponseContent();
try
{
- EPLightContent pLightContent = new EPLightContent();
+ if (taskSendLight.TagNo=="B2")
+ {
+ List<EPLightSendDTO> lightSendDTOs = new List<EPLightSendDTO>()
+ {
+ new EPLightSendDTO
+ {
+ DOCNO = taskSendLight.DocNo,
+ TASKNO= taskSendLight.TaskNo,
+ LOCATION=taskSendLight.TagCode,
+ QUANTITY=taskSendLight.TagQunity,
+ LIGHTCOLOR=taskSendLight.Color switch
+ {
+ "Blue" => "1",
+ "Green" => "2",
+ "Red" => "4",
+ _ => throw new Exception($"鏈壘鍒伴鑹插畾涔�")
+ },
+ ORDERTYPE=taskSendLight.Mode.ToString(),
+ LIGHTTYPE="1",
+ }
+ };
+ EPLightContent pLightContent = PickOrderInfoRequest(lightSendDTOs);
+ if (pLightContent.Result != "0") throw new Exception($"{pLightContent.Msg}");
+ content.OK();
+ }
+ else
+ {
+ content.OK();
+ }
+
}
catch (Exception ex)
{
@@ -567,15 +629,16 @@
CompleteType = 1
};
string request = JsonConvert.SerializeObject(containerInFinishDTO, settings);
- //璋冪敤鎺ュ彛
- string response = HttpHelper.Post(url, request);
- WMSResponseContent wMSResponse = JsonConvert.DeserializeObject<WMSResponseContent>(response) ?? throw new Exception($"{taskNum},鏈帴鏀跺埌WMS鍑哄簱涓婃姤杩斿洖鍊�");
- if (wMSResponse.Code != "0") throw new Exception($"鍑哄簱浠诲姟{task.TaskNum}WMS鍑哄簱涓婃姤閿欒,淇℃伅:{wMSResponse.Msg}");
+
_unitOfWorkManage.BeginTran();
_locationInfoRepository.UpdateData(locationInfo);
BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, LocationStatusEnum.Lock, LocationStatusEnum.Free, LocationChangeType.OutboundCompleted, task.TaskNum);
+ //璋冪敤鎺ュ彛
+ string response = HttpHelper.Post(url, request);
+ WMSResponseContent wMSResponse = JsonConvert.DeserializeObject<WMSResponseContent>(response) ?? throw new Exception($"{taskNum},鏈帴鏀跺埌WMS鍑哄簱涓婃姤杩斿洖鍊�");
+ if (wMSResponse.Code != "0") content.Message=$"鍑哄簱浠诲姟{task.TaskNum}WMS鍑哄簱涓婃姤閿欒,淇℃伅:{wMSResponse.Msg}";
}
else if(task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍏ュ簱浠诲姟瀹屾垚閫昏緫
{
@@ -595,10 +658,7 @@
CompleteType = 2
};
string request = JsonConvert.SerializeObject(containerInFinishDTO, settings);
- //璋冪敤鎺ュ彛
- string response = HttpHelper.Post(url, request);
- WMSResponseContent wMSResponse = JsonConvert.DeserializeObject<WMSResponseContent>(response) ?? throw new Exception($"{taskNum},鏈帴鏀跺埌WMS鍏ュ簱涓婃姤杩斿洖鍊�");
- if (wMSResponse.Code != "0") throw new Exception($"鍏ュ簱浠诲姟{task.TaskNum}WMS鍏ュ簱涓婃姤閿欒,淇℃伅:{wMSResponse.Msg}");
+
Dt_LocationInfo locationInfo = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
if (locationInfo.LocationStatus != LocationStatusEnum.Lock.ObjToInt())
{
@@ -612,6 +672,10 @@
BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
_unitOfWorkManage.CommitTran();
_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, LocationStatusEnum.Lock, LocationStatusEnum.InStock, LocationChangeType.InboundCompleted, task.TaskNum);
+ //璋冪敤鎺ュ彛
+ string response = HttpHelper.Post(url, request);
+ WMSResponseContent wMSResponse = JsonConvert.DeserializeObject<WMSResponseContent>(response) ?? throw new Exception($"{taskNum},鏈帴鏀跺埌WMS鍏ュ簱涓婃姤杩斿洖鍊�");
+ if (wMSResponse.Code != "0") content.Message = $"鍏ュ簱浠诲姟{task.TaskNum}WMS鍏ュ簱涓婃姤閿欒,淇℃伅:{wMSResponse.Msg}";
}
content.OK("浠诲姟瀹屾垚");
}
@@ -622,11 +686,35 @@
}
return content;
}
-
+ /// <summary>
+ /// 浜屾湡鎾澧欏洖浼�
+ /// </summary>
+ /// <returns></returns>
+ public EPLightContent WMSLightBack(List<TaskBackLight> taskBackLights)
+ {
+ EPLightContent content = new EPLightContent();
+ try
+ {
+ string? url = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMSLightBack.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(url))
+ {
+ return content.Error($"鏈壘鍒版挱绉嶅涓婃姤,璇锋鏌ユ帴鍙ｉ厤缃�");
+ }
+ string request = JsonConvert.SerializeObject(taskBackLights, settings);
+ string response = HttpHelper.Post(url, request);
+ WMSResponseContent wMSResponse = JsonConvert.DeserializeObject<WMSResponseContent>(response) ?? throw new Exception($"鏈帴鏀跺埌鎾澧欎笂鎶ヨ繑鍥炲��");
+ if (wMSResponse.Code != "0") throw new Exception($"鎾澧欎笂鎶ラ敊璇�,淇℃伅:{wMSResponse.Msg}");
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
/// <summary>
/// 浜屾湡鎾澧欎笅鍙�
/// </summary>
- /// <param name="taskNum"></param>
/// <returns></returns>
public EPLightContent PickOrderInfoRequest(List<EPLightSendDTO> lightSendDTOs)
{
@@ -638,7 +726,7 @@
{
return content.Error($"鏈壘鍒版挱绉嶅涓嬪彂鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
}
- string request = JsonConvert.SerializeObject(lightSendDTOs, settings);
+ string request = JsonConvert.SerializeObject(lightSendDTOs, settings).ToUpper();
//璋冪敤鎺ュ彛
string response = HttpHelper.Post(url, request);
EPLightContent lightContent = JsonConvert.DeserializeObject<EPLightContent>(response) ?? throw new Exception($"鏈帴鏀跺埌鎾澧欎笅鍙戜笂鎶ヨ繑鍥炲��");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/AGV/AGVExtend.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
index 6ed4caa..52bcb14 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
@@ -47,6 +47,7 @@
if (locationInfoStart == null || stationMangerEnd == null) throw new Exception($"鏈壘鍒颁换鍔″彿${task.TaskNum}璧峰鐐箋task.CurrentAddress}鎴栫洰鏍囩偣{task.NextAddress}浣嶇疆淇℃伅");
agvTaskSend.RequestId = GroupId;
agvTaskSend.MissionCode = GroupId;
+ agvTaskSend.ViewBoardType = "W01";
if (task.Grade == 0)
{
agvTaskSend.Priority = 99;
@@ -113,6 +114,7 @@
if (locationInfoEnd == null || stationMangerStart == null) throw new Exception($"鏈壘鍒颁换鍔″彿${task.TaskNum}璧峰鐐箋task.CurrentAddress}鎴栫洰鏍囩偣{task.NextAddress}浣嶇疆淇℃伅");
agvTaskSend.RequestId = Guid.NewGuid().ToString().Replace("-", "");
agvTaskSend.MissionCode = task.TaskNum.ToString();
+ agvTaskSend.ViewBoardType = "W02";
if (task.Grade == 0)
{
agvTaskSend.Priority = 99;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
index ba907c7..0ead3ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
@@ -18,6 +18,7 @@
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -104,7 +105,7 @@
}
BarCode1 = pickBarCode;
}
- if (device.DeviceCode == "CL2" && BarCode1 != pickBarCode)
+ if (device.DeviceCode == "CL2" && BarCode2 != pickBarCode)
{
WebResponseContent content = _taskService.WMSPickUp(station.PickStationCode, pickBarCode);
if (content.Status)
@@ -133,9 +134,17 @@
if (InTake==256 && InBarCode.IsNotEmptyOrNull())
{
//鐢宠鍏ュ簱浠诲姟
- Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == InBarCode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.TaskState != TaskStatusEnum.CL_Executing.ObjToInt() && x.DeviceCode==device.DeviceCode);
+ Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == InBarCode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.DeviceCode==device.DeviceCode);
if (task != null) continue;
-
+ Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x=>x.StationType==StationTypeEnum.StationType_OnlyOutbound.ObjToInt());
+ ContainerFlowDTO containerFlowDTO = new ContainerFlowDTO()
+ {
+ SlotCode = stationManger.PickStationCode,
+ ContainerCode= InBarCode,
+ Direction="100"
+ };
+ WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, stationManger.PickStationCode);
+ if (!responseContent.Status) throw new Exception(responseContent.Message);
WebResponseContent content = _taskService.RequestInTask(station.StationCode, InBarCode);
if (content.Status)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
index 0497039..334d6b7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
@@ -65,14 +65,14 @@
//WebResponseContent content = WebResponseContent.Instance.OK();
if (content.Status)
{
- //鍐欏叆鎷ｉ�夌‘璁�
- conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)300, station.StationCode);
WriteInfo(conveyorLine.DeviceCode, $"{station.PickStationCode}鎷ｉ�夌敵璇蜂笂鎶ユ垚鍔焮PickBarCode}");
}
else
{
WriteError(conveyorLine.DeviceCode, $"{station.PickStationCode}鎷ｉ�夌敵璇蜂笂鎶MS閿欒{PickBarCode}锛屼俊鎭瘂content.Message}");
}
+ //鍐欏叆鎷ｉ�夌‘璁�
+ conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)300, station.StationCode);
}
else
{
@@ -93,7 +93,7 @@
ContainerCode = PickBarCode,
Direction="100"
};
- WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, station.PickStationCode);
+ WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, station.PickStationCode,1);
if (responseContent.Status)
{
conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)containerFlowDTO.Direction.ObjToInt(), station.StationCode);
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251211_V1.1.3.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251211_V1.1.3.docx"
deleted file mode 100644
index 475a98a..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251211_V1.1.3.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251216_V1.1.3.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251216_V1.1.3.docx"
new file mode 100644
index 0000000..834aa5b
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\261\207\346\200\273\346\226\207\344\273\266/WMS\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\24320251216_V1.1.3.docx"
Binary files differ
--
Gitblit v1.9.3