From b1c2dd1869a51b8f0e4acb9ddeb148f796db147f Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 25 六月 2025 19:10:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue | 29 ++-
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs | 24 +++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 9 +
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue | 4
项目代码/DP/src/views/indexs/station-one.vue | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs | 1
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 4
项目代码/WMS/WIDESEA_WMSClient/src/views/Home.vue | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs | 10 +
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln | 4
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs | 4
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/DP/src/views/home.vue | 2
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue | 2
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin | 0
项目代码/DP/src/views/indexs/station-two.vue | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 7
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs | 17 ++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs | 33 +++-
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs | 9
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs | 15 +
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin | 0
/dev/null | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 2
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs | 10 +
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue | 19 +-
项目代码/DP/src/views/indexs/center-map.vue | 104 ++++++++++----
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 3
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs | 4
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs | 62 ++++++++
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs | 2
42 files changed, 302 insertions(+), 96 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue"
index ed4af2d..9a71980 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue"
@@ -91,7 +91,7 @@
let timer = setTimeout(() => {
this.loading = false;
clearTimeout(timer);
- }, 500);
+ }, 1500);
},
},
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue"
index 3b3a7e8..f04a88e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue"
@@ -10,12 +10,12 @@
autoplay
preload="auto"
muted
- @click="unmuteVideo"
+ @click="handleVideoClick"
>
鎮ㄧ殑娴忚鍣ㄤ笉鏀寔瑙嗛鎾斁銆�
</video>
- <div v-if="isMuted" class="mute-hint" @click="unmuteVideo">
- <span>鐐瑰嚮鍙栨秷闈欓煶锛�5绉掑悗鑷姩鎾斁澹伴煶锛�</span>
+ <div v-if="showUnmuteButton" class="unmute-button" @click="unmuteVideo">
+ <span>馃攪 鐐瑰嚮鍙栨秷闈欓煶</span>
</div>
</dv-border-box-13>
</div>
@@ -26,45 +26,81 @@
export default {
data() {
return {
- isMuted: false,
- unmuteTimeout: null // 瀛樺偍瀹氭椂鍣ㄤ互渚挎竻鐞�
+ showUnmuteButton: true, // 鏄剧ず鍙栨秷闈欓煶鎸夐挳
+ hasUserInteracted: false, // 璁板綍鐢ㄦ埛鏄惁宸蹭氦浜�
+ wasPlaying: false // 璁板綍瑙ｉ櫎闈欓煶鍓嶇殑鎾斁鐘舵��
};
},
mounted() {
this.initVideo();
this.adjustVideoSize();
window.addEventListener('resize', this.adjustVideoSize);
-
- // 5绉掑悗鑷姩鍙栨秷闈欓煶
- this.unmuteTimeout = setTimeout(() => {
- this.unmuteVideo();
- }, 5000);
},
beforeDestroy() {
window.removeEventListener('resize', this.adjustVideoSize);
- if (this.unmuteTimeout) {
- clearTimeout(this.unmuteTimeout); // 娓呴櫎瀹氭椂鍣ㄩ伩鍏嶅唴瀛樻硠婕�
+ const video = this.$refs.videoPlayer;
+ if (video) {
+ video.removeEventListener('error', this.handleVideoError);
}
},
methods: {
- initVideo() {
+ async initVideo() {
const video = this.$refs.videoPlayer;
if (video) {
- video.addEventListener('ended', () => {
- video.currentTime = 0;
- video.play();
- });
+ // 纭繚瑙嗛浠ラ潤闊崇姸鎬佸紑濮�
+ video.muted = true;
+
+ // 娣诲姞閿欒鐩戝惉
+ video.addEventListener('error', this.handleVideoError);
+
+ // 灏濊瘯鑷姩鎾斁锛堥潤闊崇姸鎬佷笅閫氬父鍏佽锛�
+ try {
+ await video.play();
+ this.wasPlaying = true;
+ } catch (error) {
+ console.log('鑷姩鎾斁琚樆姝�:', error);
+ }
}
- document.addEventListener('click', this.unmuteVideo, { once: true });
},
- unmuteVideo() {
+
+ handleVideoClick() {
+ if (!this.hasUserInteracted) {
+ this.hasUserInteracted = true;
+ // 鐢ㄦ埛绗竴娆＄偣鍑昏棰戞椂灏濊瘯瑙ｉ櫎闈欓煶
+ this.unmuteVideo();
+ }
+ },
+
+ async unmuteVideo() {
const video = this.$refs.videoPlayer;
- if (video) {
+ if (!video) return;
+
+ // 璁板綍褰撳墠鎾斁鐘舵��
+ this.wasPlaying = !video.paused;
+
+ try {
+ // 鍏堢‘淇濊棰戝湪鎾斁
+ if (this.wasPlaying) {
+ await video.play();
+ }
+
+ // 瑙ｉ櫎闈欓煶
video.muted = false;
- video.volume = 1.0;
- this.isMuted = false;
+
+ // 闅愯棌鍙栨秷闈欓煶鎸夐挳
+ this.showUnmuteButton = false;
+ } catch (error) {
+ console.error('瑙ｉ櫎闈欓煶澶辫触:', error);
+ // 鏄剧ず鎻愮ず锛屽憡鐭ョ敤鎴烽渶瑕佷氦浜掓墠鑳芥挱鏀惧０闊�
+ this.showUnmuteButton = true;
}
},
+
+ handleVideoError(e) {
+ const video = e.target;
+ console.error('瑙嗛閿欒:', video.error);
+ },
+
adjustVideoSize() {
const video = this.$refs.videoPlayer;
if (video) {
@@ -78,7 +114,6 @@
</script>
<style scoped>
-/* 鏍峰紡淇濇寔涓嶅彉 */
.centermap {
width: 100%;
height: 100%;
@@ -106,18 +141,27 @@
width: 100%;
height: 100%;
object-fit: cover;
+ cursor: pointer;
}
-.mute-hint {
+.unmute-button {
position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background: rgba(0,0,0,0.7);
+ bottom: 20px;
+ right: 20px;
+ background: rgba(0, 0, 0, 0.7);
color: white;
- padding: 10px 20px;
- border-radius: 5px;
+ padding: 8px 16px;
+ border-radius: 20px;
cursor: pointer;
z-index: 10;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ transition: all 0.3s ease;
+
+ &:hover {
+ background: rgba(0, 0, 0, 0.9);
+ }
}
</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue"
index f4936a2..ad34f0e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue"
@@ -34,7 +34,7 @@
},
methods: {
fetchData() {
- axios.post("http://127.0.0.1:5000/api/LocationInfo/LocationStatus", null)
+ axios.post("http://172.21.1.139:5000/api/LocationInfo/LocationStatus", null)
.then((response) => {
this.tableData = [];
response.forEach(item => {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue"
index 1f5a1f1..78ce719 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue"
@@ -38,7 +38,7 @@
},
methods: {
fetchData() {
- axios.post("http://127.0.0.1:5000/api/Dt_WheelsStock/InventoryStatistics", null)
+ axios.post("http://172.21.1.139:5000/api/Dt_WheelsStock/InventoryStatistics", null)
.then((response) => {
this.tableData = [];
response.forEach(item => {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
index 927dc46..ddbbab1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
index c528554..4961545 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
index 1f0fd16..86ef209 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
index 13165d3..342a69e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
index 76d2d1d..d19b56f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index b91dc40..b1434c5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -14,12 +14,15 @@
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
//"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
//"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+
+ "ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
//"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+
+ //"ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;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/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index a32ff9a..32ecfde 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -911,6 +911,8 @@
}
}
+
+ //璇诲彇鐢宠锛岀粰agv涓嬪彂浠诲姟
public WebResponseContent GetAGVTaskdistribution(string TargetAddress)
{
@@ -927,6 +929,7 @@
var wmsIpAddress = wmsBase + completeTask;
var taskDto = new RequestTaskDto()
{
+ RequestType = "999",
Position = TargetAddress,
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index a10955a..c1e3af2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -378,9 +378,8 @@
else
{
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);
- Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屾湭鎵惧埌,鍐欏叆鐢宠瘔淇℃晠闅滐細2");
+ Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屾湭鎵惧埌浠诲姟锛岀敵璇蜂笅涓�鍦板潃涓猴細{stationInfo.stationChildCode},鍐欏叆鐢宠瘔淇℃晠闅滐細2");
}
- //_taskService.UpdatePosition(task.TaskNum, stationInfo.stationChildCode);
}
#region 杞﹁酱绾夸氦浜�
@@ -415,7 +414,6 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void RequestTakeCZ(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo)
{
-
WebResponseContent content = _taskService.UpdateAxleCurrentStatue(command.Number);
if (content.Status)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
index 17edbff..dbaa4e9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
@@ -10,7 +10,7 @@
<el-button class="bun1" type="danger" v-if="item.stationStatus === '0'"
v-on:click="selectss(1)">1鍙峰帇瑁呮満</el-button>
<p>
- 2鍙峰帇瑁呮満 :
+ 1鍙峰帇瑁呮満 :
<el-tag type="success" v-if="item.stationStatus === '1'">鍚敤</el-tag>
<el-tag type="danger" v-if="item.stationStatus === '0'">绂佺敤</el-tag>
</p>
@@ -23,7 +23,7 @@
<el-button class="bun2" type="danger" v-if="item.stationStatus === '0'"
v-on:click="selectss(2)">2鍙峰帇瑁呮満</el-button>
<p>
- 1鍙峰帇瑁呮満 :
+ 2鍙峰帇瑁呮満 :
<el-tag type="success" v-if="item.stationStatus === '1'">鍚敤</el-tag>
<el-tag type="danger" v-if="item.stationStatus === '0'">绂佺敤</el-tag>
</p>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue"
index 9dd2ac1..3dd1eb9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue"
@@ -26,11 +26,18 @@
const editFormFields = ref({ "locationStatus": "" });
const editFormOptions = ref([
[
- { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
- { "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
+ { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
]
]);
- const searchFormFields = ref({ "LocationID": "",roadWayNO:"","column":"","row":"","layer":"" });
+ const searchFormFields = ref({
+ locationCode:"",
+ locationStatus:"",
+ roadWayNO:"",
+ column:"",
+ enalbeStatus:"",
+ depth:"",
+ });
const searchFormOptions = ref([
[
{ "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
@@ -38,9 +45,9 @@
{ "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
],
[
- { "title": "琛�", "field": "row", type: "int" },
- { "title": "鍒�", "field": "column", type: "int" },
- { "title": "灞�", "field": "layer", type: "int" },
+ { "title": "琛�", "field": "row", type: "text" },
+ { "title": "鍒�", "field": "column", type: "text" },
+ { "title": "灞�", "field": "layer", type: "text" },
],
[
{ "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
@@ -51,23 +58,23 @@
const columns = ref([{ field: 'id', title: '璐т綅ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
{ field: 'locationCode', title: '璐т綅缂栧彿', type: 'string', width: 110, require: true, align: 'left' },
{ field: 'locationName', title: '璐т綅鍚嶇О', type: 'string', width: 120, align: 'left' },
- { field: 'roadwayNo', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left'},
+ { field: 'roadwayNo', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left' },
{ field: 'row', title: '琛�', type: 'int', width: 70, align: 'left' },
{ field: 'column', title: '鍒�', type: 'int', width: 70, align: 'left' },
{ field: 'layer', title: '灞�', type: 'int', width: 70, align: 'left' },
{ field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left' },
{ field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
+ { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "LocationType", data: [] } },
{ field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
- { field: 'enalbeStatus', title: '鏄惁绂佺敤', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }},
+ { field: 'enalbeStatus', title: '鏄惁绂佺敤', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] } },
// { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
{ field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left', bind: { key: "AllowStatus", data: [] } },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- ]);
+ ]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue"
index 4afb5ed..f4934a7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue"
@@ -2,7 +2,7 @@
*Author锛歫xx
*Contact锛�283591387@qq.com
*浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wms/basicinfo/Dt_AreaInfo.js姝ゅ缂栧啓
+ *涓氬姟璇峰湪@/extension/widesea_wms/basicinfo/Dt_LocationInfo.js姝ゅ缂栧啓
-->
<template>
<view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
@@ -16,7 +16,7 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '杞﹀瀷绠＄悊',
name: 'basicinfo/Dt_Traintype',
@@ -24,8 +24,8 @@
sortName: "id"
});
const editFormFields = ref({
- "traintype_code": "",
- "traintype_name": ""
+ traintype_code:"",
+ traintype_name:""
});
const editFormOptions = ref([
[
@@ -33,14 +33,17 @@
{ "title": "杞﹀瀷鍚嶇О", "field": "traintype_name", type: "text" },
]
]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ "traintype_code": "",
+ "traintype_name": ""
+ });
const searchFormOptions = ref([
[
- { "title": "杞﹀瀷浠ｇ爜", "field": "traintype_code", type: "text" },
- { "title": "杞﹀瀷鍚嶇О", "field": "traintype_name", type: "text" },
+ { "title": "杞﹀瀷浠ｇ爜", "field": "traintype_code", type: "like" },
+ { "title": "杞﹀瀷鍚嶇О", "field": "traintype_name", type: "like" },
]
]);
- const columns = ref([{ field: 'ID', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
+ const columns = ref([{ field: 'id', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
{ field: 'traintype_code', title: '杞﹀瀷浠ｇ爜', type: 'string', sort: true, width: 90, align: 'left',},
{ field: 'traintype_name', title: '杞﹀瀷鍚嶇О', type: 'int', sort: true, width: 90, align: 'left' },
{ field: 'traintype_des', title: '鎻忚堪', type: 'int', sort: true, width: 200, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue"
index 7325de3..8574e3d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue"
@@ -28,7 +28,7 @@
const searchFormFields = ref({});
const searchFormOptions = ref([
[
- { "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
+ { "title": "璐т綅缂栧彿", "field": "locationCode", type: "like" },
{ "title": "鍙樺姩鍓嶈揣浣嶇姸鎬�", "field": "BeforeStatus", "type": "select", dataKey: "LocationState", data: [] },
{ "title": "鍙樺姩鍚庤揣浣嶇姸鎬�", "field": "AfterStatus", "type": "select", dataKey: "LocationState", data: [] },
{ "title": "鍙樺姩绫诲瀷", "field": "changeType", type: "select", dataKey: "StatusChangeType", data: [] },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
index 013f3b6..5379a4d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
@@ -37,7 +37,7 @@
wheels_mttype:"",
wheelsProps:"",
wheels_level:"",
- creater:"",
+ createDate:"",
});
const searchFormOptions = ref([
[
@@ -53,7 +53,7 @@
],
[
{ "title": "绛夌骇", "field": "wheels_level", type: "text" },
- { "title": "鍒涘缓鏃堕棿", "field": "creater", type: "datetime" },
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
]
]);
const columns = ref([
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue"
index c7cdde3..51b5e83 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue"
@@ -50,7 +50,7 @@
wheels_mttype:"",
wheelsProps:"",
wheels_level:"",
- creater:"",
+ createDate:"",
});
const searchFormOptions = ref([
[
@@ -66,7 +66,7 @@
],
[
{ "title": "绛夌骇", "field": "wheels_level", type: "text" },
- { "title": "鍒涘缓鏃堕棿", "field": "creater", type: "datetime" },
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
]
]);
const columns = ref([
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
index 4cc1361..7644ea1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
@@ -40,7 +40,7 @@
});
const searchFormOptions = ref([
[
- { "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
+ { "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "like" },
{ "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
//{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
{ "title": "杞瀷", "field": "wheels_ldxh", type: "text" },
@@ -83,6 +83,8 @@
{ field: 'wheels_ljz', title: '杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'wheels_ygljz', title: '棰勪及杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_Statue', title: '瀛樻湡鐘舵��', type: 'int', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_DateDet', title: '褰撳墠搴撳瓨澶╂暟', type: 'int', sort: true, width: 100, align: 'left' },
{ field: 'wheels_InDate', title: '鍏ュ簱鏃ユ湡', type: 'string',width: 100, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
index 6405797..01036e0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin"
deleted file mode 100644
index 5e64abf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
index 83a2c96..03d66c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin"
deleted file mode 100644
index fa0f7a7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
index 3d5019a..b3cfe09 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 8376467..18f16de 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 2e7e270..5770bec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
index a3a9e87..a750b7d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
index 98959a1..fb0c1ca 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
@@ -73,7 +73,15 @@
LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
if (expressionType == LinqExpressionType.Equal)
{
- where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
+ if(searchParametersList[i].Name == "column")
+ {
+ where += $"[{searchParametersList[i].Name}] {HtmlElementType.Equal} '{results[j].Item3}'";
+ }
+ else
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
+ }
+
}
else if (expressionType == LinqExpressionType.ThanOrEqual)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
index ee96461..8357492 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
@@ -498,21 +498,30 @@
/// <returns></returns>
public virtual PageGridData<TEntity> QueryPage(string where, int pageIndex, int pageSize, Dictionary<string, OrderByType> orderBy)
{
- List<OrderByModel> orderByModels = new List<OrderByModel>();
- foreach (var item in orderBy)
+ try
{
- OrderByModel orderByModel = new OrderByModel()
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+ foreach (var item in orderBy)
{
- FieldName = item.Key,
- OrderByType = item.Value
- };
- orderByModels.Add(orderByModel);
- }
- int totalCount = 0;
- List<TEntity> list = _db.Queryable<TEntity>()
- .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize, ref totalCount);
+ OrderByModel orderByModel = new OrderByModel()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ int totalCount = 0;
+ List<TEntity> list = _db.Queryable<TEntity>()
+ .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize, ref totalCount);
- return new PageGridData<TEntity>(totalCount, list);
+
+ return new PageGridData<TEntity>(totalCount, list);
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
}
/// <summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
index d7d28e8..32d431f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
@@ -96,6 +96,8 @@
public const string TempHour = "TempHour";
+ public const string InventoryMarket = "InventoryMarket";
+
/// <summary>
/// 璇锋眰wcs锛屽啓鍏ヨ緭閫佺嚎鍙嶉
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
index 11bc677..fc09738 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
@@ -8,6 +8,7 @@
Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps);
WebResponseContent InventoryStatistics();
+ WebResponseContent UpdateInventoryStatue();
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs"
index 78d9300..0f04880 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs"
@@ -46,7 +46,7 @@
/// 璐т綅鍒�
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "璐т綅鍒�")]
- public int Column { get; set; }
+ public int Column{ get; set; }
/// <summary>
/// 璐т綅灞�
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs"
index 435d472..b122460 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs"
@@ -1,4 +1,5 @@
锘縰sing AngleSharp.Text;
+using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -16,24 +17,28 @@
/// <summary>
/// 涓婚敭
/// </summary>
+ [ExporterHeader(DisplayName = "涓婚敭", IsIgnore = true)]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Wheels_ID { get; set; }
/// <summary>
/// 杞﹁疆鍙�
/// </summary>
+ [ExporterHeader(DisplayName = "杞﹁疆鏉＄爜")]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆鏉＄爜")]
public string Wheels_code { get; set; }
/// <summary>
/// 绫诲埆 (杞﹁疆/ 鍒跺姩鐩�)
/// </summary>
+ [ExporterHeader(DisplayName = "杞﹁疆", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绫诲埆(杞﹁疆/鍒跺姩鐩�)")]
public string Wheels_Type { get; set; }
/// <summary>
/// 鐘舵�� 1-鍒涘缓 2-鍏ュ簱 3-瀹屾垚 4-鍒犻櫎
/// </summary>
+ [ExporterHeader(DisplayName = "鐘舵��", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐘舵��")]
public string Wheels_CurrentStatue { get; set; }
/// <summary>
@@ -44,112 +49,131 @@
/// <summary>
/// 杞﹁疆鏉＄爜
/// </summary>
+ [ExporterHeader(DisplayName = "杞﹁疆鏉＄爜",IsIgnore =true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆鏉＄爜")]
public string Wheels_Num { get; set; }
/// <summary>
/// 杞鏉＄爜
/// </summary>
+ [ExporterHeader(DisplayName = "杞鏉＄爜")]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞鏉＄爜")]
public string Wheels_ldtm { get; set; }
/// <summary>
/// 杞﹀瀷
/// </summary>
+ [ExporterHeader(DisplayName = "杞﹀瀷")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹀瀷")]
public string Wheels_CarType { get; set; }
/// <summary>
/// 閰嶅睘灞�
/// </summary>
+ [ExporterHeader(DisplayName = "閰嶅睘灞�")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "閰嶅睘灞�")]
public string Wheels_psj { get; set; }
/// <summary>
/// 杞︾粍鍙�
/// </summary>
+ [ExporterHeader(DisplayName = "杞︾粍鍙�")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞︾粍鍙�")]
public string Wheels_CarNo { get; set; }
/// <summary>
/// 杞鍙�
/// </summary>
+ [ExporterHeader(DisplayName = "杞鍙�")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞鍙�")]
public string Wheels_ldh { get; set; }
/// <summary>
/// 杞鍨嬪彿
/// </summary>
+ [ExporterHeader(DisplayName = "杞鍨嬪彿")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞鍨嬪彿")]
public string Wheels_ldxh { get; set; }
/// <summary>
/// 鍔ㄦ嫋灞炴�锛氬姩,T锛氭嫋 M/T锛氬姩鎷栭�氱敤
/// </summary>
+ [ExporterHeader(DisplayName = "鍔ㄦ嫋灞炴��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍔ㄦ嫋灞炴��")]
public string Wheels_mttype { get; set; }
/// <summary>
/// 鏂版棫灞炴�� 1锛氭棫 0 锛氭柊
/// </summary>
+ [ExporterHeader(DisplayName = "鏂版棫灞炴�� 0 : 鏂� / 1 : 鏃� ")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鏂版棫绫诲瀷")]
public string Wheels_NewOrOld { get; set; }
/// <summary>
/// 灞炴��
/// </summary>
+ [ExporterHeader(DisplayName = "杞﹁疆灞炴��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹁疆灞炴��")]
public string WheelsProps { get; set; }
/// <summary>
/// 绛夌骇
/// </summary>
+ [ExporterHeader(DisplayName = "绛夌骇")]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绛夌骇")]
public string Wheels_level { get; set; }
/// <summary>
/// 姣傚瓟a鐣岄潰鍧囧��
/// </summary>
+ [ExporterHeader(DisplayName = "姣傚瓟a鐣岄潰鍧囧��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "姣傚瓟a鐣岄潰鍧囧��")]
public string Wheels_gkzja { get; set; }
/// <summary>
/// 姣傚瓟b鐣岄潰鍧囧��
/// </summary>
+ [ExporterHeader(DisplayName = "姣傚瓟b鐣岄潰鍧囧��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "姣傚瓟b鐣岄潰鍧囧��")]
public string Wheels_gkzjb { get; set; }
/// <summary>
/// 姣傚瓟c鐣岄潰鍧囧��
/// </summary>
+ [ExporterHeader(DisplayName = "姣傚瓟c鐣岄潰鍧囧��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "姣傚瓟c鐣岄潰鍧囧��")]
public string Wheels_gkzjc { get; set; }
/// <summary>
/// 姣傚瓟鍧囧��
/// </summary>
+ [ExporterHeader(DisplayName = "姣傚瓟鍧囧��")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "姣傚瓟鍧囧��")]
public string Wheels_gkcc { get; set; }
/// <summary>
/// 杞緞鍊�
/// </summary>
+ [ExporterHeader(DisplayName = "杞緞鍊�")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞緞鍊�")]
public string Wheels_ljz { get; set; }
/// <summary>
/// 棰勪及杞緞鍊�
/// </summary>
+ [ExporterHeader(DisplayName = "棰勪及杞緞鍊�")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "棰勪及杞緞鍊�")]
public string Wheels_ygljz { get; set; }
/// <summary>
/// 鍏ュ簱鏃ユ湡
/// </summary>
+ [ExporterHeader(DisplayName = "鍏ュ簱鏃ユ湡")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍏ュ簱鏃ユ湡")]
public string Wheels_InDate { get; set; }
/// <summary>
/// 杞紭
/// </summary>
+ [ExporterHeader(DisplayName = "杞紭")]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞紭")]
public string Wheels_LYH { get; set; }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
index 4c923ba..805ca51 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -8,19 +9,21 @@
namespace WIDESEA_Model.Models
{
- [SugarTable(nameof(Dt_InZdp_mes_hty), "MES鍒跺姩鐩樺巻鍙蹭俊鎭�")]
+ [SugarTable(nameof(Dt_InWheels_mes_hty), "MES鍒跺姩鐩樺巻鍙蹭俊鎭�")]
- public class Dt_InZdp_mes_hty : Dt_InZdp_mes
+ public class Dt_InWheels_mes_hty : Dt_InWheels_mes
{
/// <summary>
/// 瀹屾垚鏃堕棿
/// </summary>
+ [ExporterHeader(DisplayName = "瀹屾垚鏃堕棿", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "瀹屾垚鏃堕棿")]
public DateTime? FinishDate { get; set; } = DateTime.Now;
/// <summary>
/// 瀹屾垚鏂瑰紡
/// </summary>
+ [ExporterHeader(DisplayName = "瀹屾垚鏂瑰紡", IsIgnore =true)]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "瀹屾垚鏂瑰紡")]
public int OperateType { get; set; }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs"
index 190adec..66363eb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs"
@@ -212,5 +212,22 @@
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞紭")]
public string Wheels_LYH { get; set; }
+
+ /// <summary>
+ /// 瀛樻湡鐘舵�� 锛�0琛ㄧず姝ｅ父 1琛ㄧず瓒呮湡锛�
+ /// </summary>
+ [ImporterHeader(Name = "瀛樻湡鐘舵��")]
+ [ExporterHeader(DisplayName = "瀛樻湡鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "瀛樻湡鐘舵��")]
+ public int Wheels_Statue { get; set; }
+
+ /// <summary>
+ /// 褰撳墠搴撳瓨澶╂暟
+ /// </summary>
+ [ImporterHeader(Name = "褰撳墠搴撳瓨澶╂暟")]
+ [ExporterHeader(DisplayName = "褰撳墠搴撳瓨澶╂暟")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "褰撳墠搴撳瓨澶╂暟")]
+ public int Wheels_DateDet { get; set; } = 0;
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
index 6b5281c..ac4c831 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
@@ -26,11 +26,20 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (input.RequestType == "999")
+ {
+ int CZInfotli = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3").Count();
+ if (CZInfotli == 0)
+ {
+ return content.Error($"娌℃湁鑷姩鍙栬酱浠诲姟锛屾棤鑷姩浠诲姟");
+ }
+ }
+
if (string.IsNullOrEmpty(input.Position)) { return content.Error($"agv浠诲姟涓嬪彂鐢宠鐩爣鍦板潃涓虹┖锛侊紒锛佽妫�鏌�"); }
//鏌ユ壘褰撳墠鍦ㄨ溅杞寸嚎鏈闇�瑕乤gv鎼繍鐨勮溅杞�
- List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3" || x.CurrentStatue == "4" || x.CurrentStatue == "5" || x.CurrentStatue == "13");
+ List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3" /*|| x.CurrentStatue == "4" || x.CurrentStatue == "5"*/ || x.CurrentStatue == "13");
if (CZInfotlist.Count >= 2) { return content.Error($"宸叉湁agv浠诲姟姝ｅ湪杩涜涓紝涓嬪彂澶辫触锛侊紒锛�"); }
@@ -59,7 +68,7 @@
//agv鍙傛暟璋冨彇
genAgvSchedulingTask schedulingTask = new genAgvSchedulingTask
{
- reqCode = Guid.NewGuid().ToString().Replace("-", ""),
+ reqCode = $"{DateTime.Now:yyyyMMddHHmmss}",
clientCode = "WMS",
taskTyp = "BY",
ctnrTyp = "1",
@@ -108,7 +117,7 @@
catch (Exception ex)
{
LogFactory.GetLog("涓嬪彂AGV浠诲姟").Error(true, ex.Message);
- return content.Error($"璇锋眰寮傚父锛歿ex.Message}");
+ return content.Error($"涓嬪彂浠诲姟鎺ュ彛寮傚父锛歿ex.Message}");
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
index 135cf05..92528a8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
@@ -18,7 +18,7 @@
public partial class ToAPPService
{
/// <summary>
- /// 淇濆瓨杞﹁酱鏁版嵁
+ /// 淇濆瓨杞﹁酱鏁版嵁锛堣溅杞�夐厤锛�
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
@@ -165,7 +165,7 @@
string wheelsProps = CheckTaskChangeHelper.CheckTaskwheelsProps(wxrw);
- Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType== Cartype && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
+ Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType.Contains(Cartype) && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
if (selectionStandards == null) throw new Exception($"姝よ溅鍨媨Cartype}鐨勯�夐厤鏍囧噯寮傚父,璇锋牳瀵归�夐厤鏍囧噯淇℃伅!");
Dt_CZInfo_mes CZInfo_Mes = new Dt_CZInfo_mes
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
index 1a7560b..f4d3b9a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
@@ -68,7 +68,7 @@
- inf2o.ZPH = "20231021-0019/25103295 0011";
+ /*inf2o.ZPH = "20231021-0019/25103295 0011";
inf2o.CHEXING = "CRH1A";
inf2o.NEWOLD = "鏃�";
inf2o.POS = "涓棿";
@@ -90,7 +90,7 @@
inf2o.GKJZ = "0.22";
inf2o.LSCSYMH = "0.42";
inf2o.LMCSYMH = "0.031";
- inf2o.RKSJ = DateTime.Now.ToString();
+ inf2o.RKSJ = DateTime.Now.ToString();*/
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
index e44767e..6a3ac42 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
@@ -15,6 +15,9 @@
using Autofac.Core;
using NetTaste;
using AngleSharp.Io;
+using WIDESEA_IRepository;
+using WIDESEA_Core.Const;
+using WIDESEA_IServices;
namespace WIDESEA_StorageBasicService;
@@ -23,11 +26,13 @@
private readonly IDt_WheelsStock_htyRepository _WheelsStock_HtyRepository;
private readonly IDt_SelectionStandardsRepository _SelectionStandardsRepository;
private readonly IToZYService _toZYService;
- public Dt_WheelsStockService(IDt_WheelsStockRepository BaseDal, IDt_WheelsStock_htyRepository WheelsStock_HtyRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IToZYService toZYService) : base(BaseDal)
+ private readonly ISys_ConfigService _sys_ConfigService;
+ public Dt_WheelsStockService(IDt_WheelsStockRepository BaseDal, IDt_WheelsStock_htyRepository WheelsStock_HtyRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IToZYService toZYService, ISys_ConfigService ISys_ConfigService) : base(BaseDal)
{
_SelectionStandardsRepository = selectionStandardsRepository;
_WheelsStock_HtyRepository = WheelsStock_HtyRepository;
_toZYService = toZYService;
+ _sys_ConfigService = ISys_ConfigService;
}
/// <summary>
@@ -259,21 +264,72 @@
//鑾峰彇杞﹀瀷
List<string> Wheels_CarTypeList = stockInfos.Select(x => x.Wheels_CarType).Distinct().ToList();
+ List<WheelGroupInfo> groupedData = new List<WheelGroupInfo>();
foreach (var CarType in Wheels_CarTypeList)
{
- content.Data = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
- .Select(typeGroup => new
+ var kd = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
+ .Select(typeGroup => new WheelGroupInfo
{
Wheels_CarType = CarType, //杞﹀瀷
Wheels_ldxh = typeGroup.Key,
Count = typeGroup.Count(),
}).ToList();
+
+ groupedData.AddRange(kd);
}
+ content.Data = groupedData;
return content;
}
+ public class WheelGroupInfo
+ {
+ public string Wheels_CarType { get; set; }
+ public string Wheels_ldxh { get; set; }
+ public int Count { get; set; }
+
+ }
+
+ public WebResponseContent UpdateInventoryStatue()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ List<Dt_WheelsStock> groupedData = new List<Dt_WheelsStock>();
+
+ var hourpara = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_Parameters, SysConfigConst.InventoryMarket);
+ int hour = hourpara.ConfigValue.ObjToInt(); //鑾峰彇璁剧疆鐨勯鏈熸椂闂�
+
+ List<Dt_WheelsStock> WheelsList = BaseDal.QueryData(); //鑾峰彇鍏ㄩ儴杞﹁疆淇℃伅
+
+ foreach (var item in WheelsList)
+ {
+ TimeSpan timeDifference = DateTime.Today - item.CreateDate.Date;
+ item.Wheels_DateDet = (int)timeDifference.TotalDays;
+
+ if (item.Wheels_DateDet >= hour)
+ {
+ item.Wheels_Statue = 1;
+ }
+ else
+ {
+ item.Wheels_Statue = 0;
+ }
+ groupedData.Add(item);
+ }
+
+ BaseDal.UpdateData(groupedData);
+
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ throw;
+ }
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 0bc4bf0..5e31884 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -11,6 +11,7 @@
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
+using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
@@ -38,10 +39,12 @@
private readonly IDt_InWheels_mes_htyRepository _InWheels_Mes_HtyRepository;
private readonly IDt_CacheInfoRepository _CacheInfoRepository;
private readonly IDt_OutWheels_htyRepository _OutWheels_HtyRepository;
+ private readonly IDt_OutZdp_htyRepository _Dt_OutZdp_htyRepository;
private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;
private readonly IDt_InZdp_mes_htyRepository _InZdp_Mes_HtyRepository;
private readonly IDt_ZdpStockRepository _ZdpStockRepository;
private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository;
+
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -64,7 +67,8 @@
IDt_InZdp_mesRepository inZdp_MesRepository,
IDt_InZdp_mes_htyRepository inZdp_Mes_HtyRepository,
IDt_ZdpStockRepository zdpStockRepository,
- IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository) : base(BaseDal)
+ IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository,
+ IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -85,6 +89,7 @@
_InZdp_Mes_HtyRepository = inZdp_Mes_HtyRepository;
_ZdpStockRepository = zdpStockRepository;
_ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository;
+ _Dt_OutZdp_htyRepository = dt_OutZdp_HtyRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -429,6 +434,8 @@
//var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
var isStockHtyAdd = await _ZdpStock_HtyRepository.AddDataAsync(stockInfo_Hty); //鍔犲叆鍘嗗彶搴撳瓨
+
+ var isoutZDPHtyAdd = await _Dt_OutZdp_htyRepository.AddDataAsync(Outwheels_hty); //娣诲姞杞﹁疆鍑哄簱淇℃伅
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
index bb25daf..32fad0d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
@@ -74,9 +74,9 @@
.editorconfig = .editorconfig
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
index dd4e2d1..2c5c056 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
@@ -20,4 +20,14 @@
{
return Service.InventoryStatistics();
}
+
+ /// <summary>
+ /// 鏇存柊搴撳瓨鍏ュ簱鏃堕棿
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("UpdateInventoryStatue")]
+ public WebResponseContent UpdateInventoryStatue()
+ {
+ return Service.UpdateInventoryStatue();
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 7908edc..9ad446f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -12,7 +12,7 @@
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
//"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
"ConnectionStringWCS": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
--
Gitblit v1.9.3