From 59d2e6aca61cc9784994e2e96bfd1a329d169f59 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:14:47 +0800
Subject: [PATCH] 优化WCS辅料仓任务逻辑，优化WMS平库出库逻辑，优化PDA图标
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/辅料仓/AGV_FLExtend.cs | 2 +-
代码管理/淮安PDA/static/CSJ.png | 0
代码管理/淮安PDA/static/KCCX.png | 0
代码管理/淮安PDA/pages/index/index.vue | 9 ++++-----
代码管理/淮安PDA/static/BC.png | 0
代码管理/淮安PDA/static/CP.png | 0
代码管理/淮安PDA/static/YM.png | 0
代码管理/淮安PDA/static/pp.png | 0
代码管理/淮安PDA/static/CK.png | 0
代码管理/淮安PDA/static/JX.png | 0
代码管理/淮安PDA/static/KCPD.png | 0
代码管理/淮安PDA/static/SH.png | 0
代码管理/淮安PDA/static/WMSRK.png | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 5 ++++-
代码管理/淮安PDA/static/FL.png | 0
代码管理/淮安PDA/static/ZXRK.png | 0
代码管理/淮安PDA/static/GM.png | 0
代码管理/淮安PDA/static/RK.png | 0
代码管理/淮安PDA/static/CPCK.png | 0
19 files changed, 9 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
index 8d00a08..4c97e00 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\350\276\205\346\226\231\344\273\223/AGV_FLExtend.cs"
@@ -22,7 +22,7 @@
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && nameof(AGV_FLJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && nameof(AGV_FLJob).Contains(x.DeviceCode) && !string.IsNullOrEmpty(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
foreach (var task in newTasks)
{
try
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 47d3b97..a197ccc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -180,7 +180,10 @@
else
outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
- if (outboundOrder.Details.Count == overCount) outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ if (outboundOrder.Details.Count == overCount)
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ else
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
#endregion
#region 淇敼搴撳瓨
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
index 445e832..4236ecb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
@@ -5,8 +5,7 @@
<u-grid :col="2">
<u-grid-item @tap="clickCoupon(item.url,item.menuId,item.description,item.menuName)" v-for="(item) in tree"
:key="item.menuId">
- <u-icon :name="item.icon" custom-prefix="custom-icon" size="50"
- color="#888888"></u-icon>
+ <u-icon :name="item.icon" custom-prefix="custom-icon" size="50" color="#888888"> </u-icon>
<view class="grid-text">{{item.menuName}}</view>
</u-grid-item>
</u-grid>
@@ -32,7 +31,7 @@
},
onShow() {
console.log();
-
+
uni.getSystemInfo({
success: (res) => {
this.version = res.appWgtVersion;
@@ -54,7 +53,7 @@
AndroidCheckUpdate: function() {
var _this = this;
uni.request({
- url: this.$u.http.config.baseUrl+'/api/PDA/GetPDAVersion?version=' + this.version,
+ url: this.$u.http.config.baseUrl + '/api/PDA/GetPDAVersion?version=' + this.version,
method: 'GET',
data: {},
success: res => {
@@ -67,7 +66,7 @@
icon: "none"
});
var dtask = plus.downloader.createDownload(
- this.$u.http.config.baseUrl+"/api/PDA/DownLoadApp", {},
+ this.$u.http.config.baseUrl + "/api/PDA/DownLoadApp", {},
function(d, status) {
// 涓嬭浇瀹屾垚
if (status == 200) {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/BC.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/BC.png"
new file mode 100644
index 0000000..fe5d789
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/BC.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CK.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CK.png"
new file mode 100644
index 0000000..3488861
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CK.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CP.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CP.png"
new file mode 100644
index 0000000..ea34fcc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CP.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CPCK.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CPCK.png"
new file mode 100644
index 0000000..9f52126
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CPCK.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CSJ.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CSJ.png"
new file mode 100644
index 0000000..681e28a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/CSJ.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/FL.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/FL.png"
new file mode 100644
index 0000000..ff3b4e2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/FL.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/GM.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/GM.png"
new file mode 100644
index 0000000..f9d9552
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/GM.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/JX.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/JX.png"
new file mode 100644
index 0000000..4c9daba
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/JX.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCCX.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCCX.png"
new file mode 100644
index 0000000..4fdf597
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCCX.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCPD.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCPD.png"
new file mode 100644
index 0000000..abbc5fb
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/KCPD.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/RK.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/RK.png"
new file mode 100644
index 0000000..cb7057f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/RK.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/SH.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/SH.png"
new file mode 100644
index 0000000..e38fcba
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/SH.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/WMSRK.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/WMSRK.png"
new file mode 100644
index 0000000..0771d46
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/WMSRK.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/YM.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/YM.png"
new file mode 100644
index 0000000..fd52c2c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/YM.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/ZXRK.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/ZXRK.png"
new file mode 100644
index 0000000..56dbce3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/ZXRK.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/pp.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/pp.png"
new file mode 100644
index 0000000..ce6fadc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/static/pp.png"
Binary files differ
--
Gitblit v1.9.3