From a770206c91e495b802b3e9371e06834586ad7715 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:17:30 +0800
Subject: [PATCH] 1
---
新建文件夹/PDA/manifest.json | 4
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs | 10
新建文件夹/WMS/src/views/basic/materielInfo.vue | 14 +-
新建文件夹/PDA/pages/stash/outboundorder.vue | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs | 2
新建文件夹/WMS/src/views/stock/stockInfo.vue | 4
新建文件夹/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue | 5
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs | 2
新建文件夹/WMS/src/views/outbound/outboundOrder.vue | 18 +-
新建文件夹/WMS/src/views/inbound/inboundOrder.vue | 20 +-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 1
新建文件夹/PDA/pages/stash/inboundorderDetail.vue | 24 +-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 34 +++-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 15 ++
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 6
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs | 6
新建文件夹/PDA/pages/stash/Checkoutorder.vue | 10 +
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs | 30 ++-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs | 4
新建文件夹/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs | 8
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs | 2
新建文件夹/WMS/src/views/basic/locationInfo.vue | 80 +++++-----
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs | 36 ++--
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 3
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs | 6
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs | 4
新建文件夹/PDA/pages/stash/outboundorderDetail.vue | 33 ++--
新建文件夹/PDA/pages/stash/CheckoutorderDetail.vue | 29 ++--
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs | 4
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs | 2
31 files changed, 234 insertions(+), 186 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/manifest.json" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/manifest.json"
index f2a2135..548e50f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/manifest.json"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/manifest.json"
@@ -2,8 +2,8 @@
"name" : "fC.WMS-PDA",
"appid" : "__UNI__F08B99B",
"description" : "",
- "versionName" : "9",
- "versionCode" : 9,
+ "versionName" : "10",
+ "versionCode" : 10,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/Checkoutorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/Checkoutorder.vue"
index bc6fa3a..b8da3c9 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/Checkoutorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/Checkoutorder.vue"
@@ -55,7 +55,7 @@
pageNo: 1,
scrollTop: 0,
warehouseId: "",
- isLoaded:false
+ ischeck:false
}
},
onLoad(res) {
@@ -66,10 +66,14 @@
onReachBottom() {
this.pageNo += 1;
this.getData();
- this.isLoaded=true;
+ this.ischeck=true;
},
onShow() {
- if (this.isLoaded) {
+ this.ischeck = uni.getStorageSync('ischeck');
+ if (this.ischeck) {
+ uni.removeStorageSync('ischeck');
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
index 4f4aa81..459bec9 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
@@ -60,6 +60,7 @@
if (this.checkTask) {
uni.removeStorageSync('checkTask');
this.pageNo = 1;
+ this.allReceivingOrders = [];
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
@@ -85,7 +86,7 @@
isCheck: true,
},
}
- if (this.pageNo == 1) this.allReceivingOrders = [];
+ // if (this.pageNo == 1) this.allReceivingOrders = [];
this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', postData).then((
res) => {
if (res.status) {
@@ -111,24 +112,24 @@
//this.allReceivingOrders = [];
this.loadVisible = true;
if (this.allReceivingOrders.length < 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: '鐩樼偣宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
- success: (res) => {
- uni.getStorageSync('isLoaded',true)
- if (res.confirm) {
- // 鐢ㄦ埛鐐瑰嚮纭畾
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鐩樼偣宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ // success: (res) => {
+ uni.getStorageSync('ischeck',true)
+ // if (res.confirm) {
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
delta: 1
});
}, 500);
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
- // 鎴栬�呮墽琛屽叾浠栨搷浣�
- }
- }
- });
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
}
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
index 2dc59d9..a8fe2fd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
@@ -108,24 +108,24 @@
//this.allReceivingOrders = [];
this.loadVisible = true;
if (this.allReceivingOrders.length < 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖鍏ュ簱鍗曪紵',
- success: (res) => {
- if (res.confirm) {
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖鍏ュ簱鍗曪紵',
+ // success: (res) => {
+ // if (res.confirm) {
uni.setStorageSync('isLoaded', true);
- // 鐢ㄦ埛鐐瑰嚮纭畾
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
delta:1
});
}, 500);
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
- // 鎴栬�呮墽琛屽叾浠栨搷浣�
- }
- }
- });
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
}
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
index 499442f..01bc1ca 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
@@ -72,6 +72,8 @@
this.isout = uni.getStorageSync('isout');
if (this.isout) {
uni.removeStorageSync('isout');
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
index 72f2be3..d2ca568 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
@@ -60,6 +60,7 @@
if (this.outTask) {
uni.removeStorageSync('outTask');
this.pageNo = 1;
+ this.allReceivingOrders = [];
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
@@ -124,7 +125,7 @@
isCheck: false,
},
}
- if (this.pageNo == 1) this.allReceivingOrders = [];
+ // if (this.pageNo == 1) this.allReceivingOrders = [];
this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', postData).then((
res) => {
if (res.status) {
@@ -149,26 +150,26 @@
this.status = 'noMore';
//this.allReceivingOrders = [];
this.loadVisible = true;
- if (this.allReceivingOrders.length < 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: '鍑哄簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
- success: (res) => {
- if (res.confirm) {
- uni.getStorageSync('isLoaded',true)
- // 鐢ㄦ埛鐐瑰嚮纭畾
+ // if (this.allReceivingOrders.length < 1) {
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鍑哄簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ // success: (res) => {
+ // if (res.confirm) {
+ uni.getStorageSync('isout',true)
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
delta: 1
});
}, 500);
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
- // 鎴栬�呮墽琛屽叾浠栨搷浣�
- }
- }
- });
- }
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
+ // }
}
}
})
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
index 98b31e3..50f771e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs"
@@ -86,7 +86,7 @@
Modifier = "System"
};
addList.Add(dto);
- if (cool.Alarm != "姝ｅ父")
+ if (item.alarm != "姝ｅ父")
{
_messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, $"鍐锋煖{item.alarm}", item.message, MessageStatusEnum.Undisposed);
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
index 3b9e588..15afbf5 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs"
@@ -75,9 +75,9 @@
Creater = "System"
};
BaseDal.AddData(newRecord);
- if(robot.status== "error")
+ if (robot.status == "error")
{
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName,$"{ robot.robotName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "灏忚溅鍚嶇О:" + robot.robotName, $"灏忚溅缂栧彿銆恵robot.robotCode}銆戝彂鐢熼敊璇�", MessageStatusEnum.Emergency);
}
}
else
@@ -91,7 +91,7 @@
BaseDal.UpdateData(existingRecord);
if (robot.status == "error")
{
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName, $"{robot.robotName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "灏忚溅鍚嶇О:" + robot.robotName, $"灏忚溅缂栧彿銆恵robot.robotCode}銆戝彂鐢熼敊璇�", MessageStatusEnum.Emergency);
}
}
saveCount++;
@@ -121,7 +121,7 @@
BaseDal.AddData(newRecord);
if (sorter.status == "error")
{
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "鍒嗘嫞鍙板悕绉�:" + sorter.sorterName, $"缂栧彿銆恵sorter.sorterCode}銆戝彂鐢熼敊璇�", MessageStatusEnum.Emergency);
}
}
else
@@ -135,7 +135,7 @@
BaseDal.UpdateData(existingRecord);
if (sorter.status == "error")
{
- _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}鍙戠敓閿欒", MessageStatusEnum.Emergency);
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "鍒嗘嫞鍙板悕绉�:" + sorter.sorterName, $"缂栧彿銆恵sorter.sorterCode}銆戝彂鐢熼敊璇�", MessageStatusEnum.Emergency);
}
}
saveCount++;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
index 7136886..17f59b5 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
@@ -39,7 +39,7 @@
/// 鍒涘缓鑰�
/// </summary>
[ImporterHeader(Name = "鍒涘缓鑰�")]
- [ExporterHeader(DisplayName = "鍒涘缓鑰�")]
+ [ExporterHeader(DisplayName = "鍒涘缓鑰�", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鑰�")]
public string Creater { get; set; }
@@ -47,7 +47,7 @@
/// 鍒涘缓鏃堕棿
/// </summary>
[ImporterHeader(Name = "鍒涘缓鏃堕棿")]
- [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
+ [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿", IsIgnore = true)]
[SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鏃堕棿")]
public DateTime CreateDate { get; set; } = DateTime.Now;
@@ -59,7 +59,7 @@
/// 鏇存柊鑰�
/// </summary>
[ImporterHeader(Name = "淇敼浜�")]
- [ExporterHeader(DisplayName = "淇敼浜�")]
+ [ExporterHeader(DisplayName = "淇敼浜�", IsIgnore = true)]
[SugarColumn(IsNullable = true, Length = 50, IsOnlyIgnoreInsert = true, ColumnDescription = "淇敼浜�")]
public string Modifier { get; set; }
@@ -67,7 +67,7 @@
/// 淇敼鏃ユ湡
/// </summary>
[ImporterHeader(Name = "淇敼鏃ユ湡")]
- [ExporterHeader(DisplayName = "淇敼鏃ユ湡")]
+ [ExporterHeader(DisplayName = "淇敼鏃ユ湡", IsIgnore = true)]
[SugarColumn(IsNullable = true, IsOnlyIgnoreInsert = true, ColumnDescription = "淇敼鏃ユ湡")]
public DateTime? ModifyDate { get; set; }
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs"
index de41235..803f556 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs"
@@ -16,7 +16,7 @@
/// 涓婚敭
/// </summary>
[ImporterHeader(Name = "涓婚敭")]
- [ExporterHeader(DisplayName = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭", IsIgnore = true)]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
@@ -24,7 +24,7 @@
/// 鎵樼洏缂栧彿
/// </summary>
[ImporterHeader(Name = "鎵樼洏缂栧彿")]
- [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
+ [ExporterHeader(DisplayName = "鎵樼洏缂栧彿", IsIgnore = true)]
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
public string PalletCode { get; set; }
@@ -32,13 +32,13 @@
/// 搴撴埧缂栧彿
/// </summary>
[ImporterHeader(Name = "搴撴埧缂栧彿")]
- [ExporterHeader(DisplayName = "搴撴埧缂栧彿")]
+ [ExporterHeader(DisplayName = "搴撴埧缂栧彿", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "搴撴埧缂栧彿")]
public string WarehouseCode { get; set; }
/// <summary>
/// 璐т綅缂栧彿 //瑕佹槸鏄珛搴撶殑灏辨槸瑕�==鈥滅珛搴撯�� 骞冲簱鐨勫氨鏄湁缂栫爜鐨�
- /// </summary>
+ /// </summary>
[ImporterHeader(Name = "璐т綅缂栧彿")]
[ExporterHeader(DisplayName = "璐т綅缂栧彿")]
[SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璐т綅缂栧彿")]
@@ -48,7 +48,7 @@
/// 搴撳瓨鐘舵��
/// </summary>
[ImporterHeader(Name = "搴撳瓨鐘舵��")]
- [ExporterHeader(DisplayName = "搴撳瓨鐘舵��")]
+ [ExporterHeader(DisplayName = "搴撳瓨鐘舵��", IsIgnore = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鐘舵��")]
public int StockStatus { get; set; }
@@ -88,7 +88,7 @@
/// 瀹為檯鎬诲簱瀛樻暟
/// </summary>
[ImporterHeader(Name = "瀹為檯搴撳瓨鏁�")]
- [ExporterHeader(DisplayName = "瀹為檯搴撳瓨鏁�")]
+ [ExporterHeader(DisplayName = "搴撳瓨鏁�")]
[SugarColumn(IsNullable = false, ColumnDescription = "瀹為檯搴撳瓨鏁�")]
public decimal StockQuantity { get; set; }
@@ -96,7 +96,7 @@
/// 寰呭嚭搴撴暟 鏁翠釜鍑哄簱鍗曞崰鐢ㄧ殑
/// </summary>
[ImporterHeader(Name = "寰呭嚭搴撴暟")]
- [ExporterHeader(DisplayName = "寰呭嚭搴撴暟")]
+ [ExporterHeader(DisplayName = "寰呭嚭搴撴暟", IsIgnore = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏁�", DefaultValue = "0")]
public decimal OutboundQuantity { get; set; }
@@ -104,13 +104,17 @@
/// <summary>
/// 鍙敤搴撳瓨鏁伴噺 =瀹為檯搴撳瓨鏁�-寰呭嚭搴撴暟閲�
/// </summary>
+ [ImporterHeader(Name = "鍙敤搴撳瓨鏁伴噺")]
+ [ExporterHeader(DisplayName = "鍙敤搴撳瓨鏁伴噺", IsIgnore = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "鍙敤搴撳瓨鏁伴噺", DefaultValue = "0")]
public decimal AvailableQuantity { get; set; }
/// <summary>
/// 鎶ヨ淇℃伅
/// </summary>
- [SugarColumn(IsNullable = true,Length =255, ColumnDescription = "鎶ヨ淇℃伅")]
+ [ImporterHeader(Name = "鎶ヨ淇℃伅")]
+ [ExporterHeader(DisplayName = "鎶ヨ淇℃伅", IsIgnore = true)]
+ [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "鎶ヨ淇℃伅")]
public string AlarmInformation { get; set; }
@@ -118,7 +122,7 @@
/// 鐩樼偣鏁帮紱鐩樼偣鍚庡疄闄呮暟閲�
/// </summary>
[ImporterHeader(Name = "鐩樼偣鏁�")]
- [ExporterHeader(DisplayName = "鐩樼偣鏁�")]
+ [ExporterHeader(DisplayName = "鐩樼偣鏁�", IsIgnore = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "鐩樼偣鏁�", DefaultValue = "0")]
public decimal SupplyQuantity { get; set; }
@@ -126,7 +130,7 @@
/// 鍏ュ簱鏃堕棿
/// </summary>
[ImporterHeader(Name = "鍏ュ簱鏃堕棿")]
- [ExporterHeader(DisplayName = "鍏ュ簱鏃堕棿")]
+ [ExporterHeader(DisplayName = "鍏ュ簱鏃堕棿", IsIgnore = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "鍏ュ簱鏃堕棿")]
public DateTime? InDate { get; set; }
@@ -134,7 +138,7 @@
/// 鐢熶骇鏃ユ湡
/// </summary>
[ImporterHeader(Name = "鐢熶骇鏃ユ湡")]
- [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡")]
+ [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡", IsIgnore = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
public string ProductionDate { get; set; }
@@ -142,7 +146,7 @@
/// 淇濊川鏈�
/// </summary>
[ImporterHeader(Name = "淇濊川鏈�")]
- [ExporterHeader(DisplayName = "淇濊川鏈�")]
+ [ExporterHeader(DisplayName = "淇濊川鏈�", IsIgnore = true)]
[SugarColumn(IsNullable = false, ColumnDescription = "淇濊川鏈�")]
public int ShelfLife { get; set; }
@@ -158,7 +162,7 @@
/// 澶囨敞
/// </summary>
[ImporterHeader(Name = "澶囨敞")]
- [ExporterHeader(DisplayName = "澶囨敞")]
+ [ExporterHeader(DisplayName = "搴撴埧")]
[SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
index 06ba197..d730808 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
@@ -15,7 +15,7 @@
/// 浠诲姟淇℃伅
/// </summary>
[SugarTable(nameof(Dt_SupplyTask), "鐩樼偣浠诲姟淇℃伅"), SugarIndex("unique_task_taskNum", nameof(TaskNum), OrderByType.Asc, true)]
- public class Dt_SupplyTask : BaseEntity
+ public class Dt_SupplyTask : BaseEntity
{
/// <summary>
@@ -134,7 +134,7 @@
/// 浠诲姟涓嬪彂鏃堕棿
/// </summary>
[ImporterHeader(Name = "浠诲姟涓嬪彂鏃堕棿")]
- [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
+ [ExporterHeader(DisplayName = "浠诲姟涓嬪彂鏃堕棿", IsIgnore = true)]
[SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")]
public DateTime? Dispatchertime { get; set; }
@@ -142,7 +142,7 @@
/// 澶囨敞
/// </summary>
[ImporterHeader(Name = "澶囨敞")]
- [ExporterHeader(DisplayName = "澶囨敞")]
+ [ExporterHeader(DisplayName = "绫诲瀷")]
[SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs"
index 5832707..e15f2c9 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs"
@@ -17,6 +17,8 @@
[SugarTable(nameof(Dt_SupplyTask_Hty), "浠诲姟淇℃伅鍘嗗彶")]
public class Dt_SupplyTask_Hty : Dt_SupplyTask, IBaseHistoryEntity
{
+ [ImporterHeader(Name = "浠诲姟鍙�")]
+ [ExporterHeader(DisplayName = "浠诲姟鍙�", IsIgnore = true)]
public new int TaskNum { get; set; }
/// <summary>
/// 鍘熻〃涓婚敭
@@ -30,7 +32,7 @@
/// 鎿嶄綔绫诲瀷
/// </summary>
[ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
- [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷", IsIgnore = true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
public string OperateType { get; set; }
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
index 9eee10d..5d99726 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
@@ -69,7 +69,7 @@
if (response == null || response.resultCode != "0" || requestData == null)
{
// 璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
@@ -154,7 +154,7 @@
{
_unitOfWorkManage.RollbackTran();
_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
- SendErrorToUpstream(1, "", ex.Message, "");
+ //SendErrorToUpstream(1, "", ex.Message, "");
//return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
};
@@ -164,7 +164,7 @@
catch (Exception ex)
{
// 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- SendErrorToUpstream(1, "", ex.Message, "");
+ //SendErrorToUpstream(1, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -193,7 +193,7 @@
if (response.resultCode != "0")
{
- SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
@@ -282,7 +282,7 @@
{
_unitOfWorkManage.RollbackTran();
_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
- SendErrorToUpstream(3, "", ex.Message, "");
+ //SendErrorToUpstream(3, "", ex.Message, "");
//return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -290,7 +290,7 @@
}
catch (Exception ex)
{
- SendErrorToUpstream(3, "", ex.Message, "");
+ //SendErrorToUpstream(3, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -395,7 +395,7 @@
}
else
{
- SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
+ //SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
Console.WriteLine($"璁㈠崟 {order.Order_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
return new WebResponseContent { Status = false, Message = "璁㈠崟鎺ㄩ�佸け璐�" };
}
@@ -507,14 +507,14 @@
}
else
{
- SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
+ //SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
}
//鍒犻櫎鍏ㄩ儴鐘朵负宸插畬鎴愮殑鏄庣粏鍜岃〃澶达紝绉诲叆鍘嗗彶琛�
}
catch (Exception ex)
{
- SendErrorToUpstream(3, order.Out_no, ex.Message, "");
+ //SendErrorToUpstream(3, order.Out_no, ex.Message, "");
Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸紓甯革細{ex.Message}");
}
}
@@ -546,7 +546,7 @@
foreach (var inorder in inorders)
{
var Orders = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == inorder).Includes(x => x.Details).ToList();
-
+
if (!Orders.Where(x => x.OdrderStatus != "宸插畬鎴�").Any())
{
if (Orders.FirstOrDefault().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
@@ -581,11 +581,16 @@
}
else
{
+ string mess = "涓婃姤ERP鏃犲搷搴�";
+ if (response != null) mess = response.resultMsg;
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, $"鍏ュ簱鍗曞彿銆恵inorder}銆戝畬鎴愪笂鎶RP澶辫触", mess);
//_unitOfWorkManage.RollbackTran();
- SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", inorder);
+ //SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", inorder);
continue;
}
}
+
+
}
}
#endregion
@@ -639,7 +644,7 @@
};
var result = HttpHelper.Post(url, requestDate.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
- if (response.resultCode == "0")
+ if (response != null && response.resultCode == "0")
{
foreach (var item in Orders)
{
@@ -651,8 +656,11 @@
}
else
{
+ string mess = "涓婃姤ERP鏃犲搷搴�";
+ if (response != null) mess = response.resultMsg;
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, $"鍑哄簱鍗曞彿銆恵outorder}銆戝畬鎴愪笂鎶RP澶辫触", mess);
//_unitOfWorkManage.RollbackTran();
- SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", outorder);
+ //SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", outorder);
continue;
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index d5609ee..50d8b4e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -199,6 +199,21 @@
Creater = App.User.UserName,
CreateDate = DateTime.Now,
};
+ switch (inventoryInfo.WarehouseCode)
+ {
+ case "001":
+ inventoryInfo.Remark = "鏅鸿兘绔嬪簱";
+ break;
+ case "002":
+ inventoryInfo.Remark = "澶т欢搴�";
+ break;
+ case "003":
+ inventoryInfo.Remark = "楹荤簿搴�";
+ break;
+ case "010":
+ inventoryInfo.Remark = "鍐峰喕搴�";
+ break;
+ }
_inventoryInfoService.AddData(inventoryInfo);
}
#endregion
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs"
index 4c0780a..dee0067 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs"
@@ -45,7 +45,7 @@
if (response.resultCode!="0")
{
// 璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(7, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(7, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
if (response.data == null || !response.data.Any())
@@ -70,7 +70,7 @@
}
catch (Exception ex)
{
- SendErrorToUpstream(7, "", ex.Message, "");
+ //SendErrorToUpstream(7, "", ex.Message, "");
return responseContent.Error(ex.Message);
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index a341ca7..edbeaf3 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -453,6 +453,7 @@
BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
#endregion
}
+ webResponseContent.OK();
}
catch (Exception ex)
{
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index fb4045a..6611878 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -54,7 +54,7 @@
if (response.resultCode != "0")
{
- SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
@@ -82,7 +82,7 @@
catch (Exception ex)
{
Db.Ado.RollbackTran();
- SendErrorToUpstream(8, "", ex.Message, "");
+ //SendErrorToUpstream(8, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
@@ -229,7 +229,7 @@
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
ShelfLife = 0,
ValidityPeriod = cabinOrderDetail.Exp_date,
- Remark = "WCS鍥炰紶鍒涘缓"
+ Remark = "鏅鸿兘绔嬪簱"
};
BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
index 1a0f843..7746d1b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
@@ -27,7 +27,7 @@
}
public IRepository<Dt_MedicineGoods> Repository => BaseDal;
- static string SearchDate = "";
+ static string SearchDate = "2025-10-1 20:45:16";
/// <summary>
/// 鑾峰彇鑽搧鍩虹淇℃伅鍚屾鎺ュ彛
@@ -44,21 +44,21 @@
//if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//璇锋眰鍙傛暟
- var requestData = new
- {
- searchDate = "2009-01-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- //if (string.IsNullOrEmpty(SearchDate))
- //{
- // // 榛樿鏌ヨ杩囧幓24灏忔椂鐨勬暟鎹�
- // SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
- //}
- // 璇锋眰鍙傛暟
//var requestData = new
//{
- // searchDate = SearchDate
+ // searchDate = "2009-01-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
//};
- //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ if (string.IsNullOrEmpty(SearchDate))
+ {
+ // 榛樿鏌ヨ杩囧幓24灏忔椂鐨勬暟鎹�
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ // 璇锋眰鍙傛暟
+ var requestData = new
+ {
+ searchDate = SearchDate
+ };
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
// 鍙戣捣璇锋眰
var result = HttpHelper.Post(url, requestData.ToJsonString());
@@ -68,7 +68,7 @@
if (response.resultCode != "0")
{
// 璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(5, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(5, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
if (response.data == null || !response.data.Any())
@@ -114,7 +114,7 @@
catch (Exception ex)
{
- SendErrorToUpstream(5, "", ex.Message, "");
+ //SendErrorToUpstream(5, "", ex.Message, "");
return responseContent.Error(ex.Message);
}
}
@@ -185,9 +185,9 @@
}
else
{
- SendErrorToUpstream(5, medicineDTO.materialCode, resp?.msg ?? "WCS鑽搧淇℃伅鍚屾澶辫触", "");
-
- return new WebResponseContent { Status = false, Message = "璁㈠崟鎺ㄩ�佸け璐�" };
+ //SendErrorToUpstream(5, medicineDTO.materialCode, resp?.msg ?? "WCS鑽搧淇℃伅鍚屾澶辫触", "");
+ //return new WebResponseContent { Status = false, Message = "璁㈠崟鎺ㄩ�佸け璐�" };
+ continue;
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs"
index 743c69a..84798d5 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs"
@@ -47,7 +47,7 @@
if (response.resultCode!="0")
{
//璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(6, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
+ //SendErrorToUpstream(6, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
if (response.data == null || !response.data.Any())
@@ -73,7 +73,7 @@
catch (Exception ex)
{
- SendErrorToUpstream(6, "", ex.Message, "");
+ //SendErrorToUpstream(6, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
index a8743ee..85860f4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
@@ -46,7 +46,7 @@
foreach (var item in dt_InventoryInfos)
{
if (materielInfo.Business_qty >= materielInfo.MinQty) break;
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ //item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
while (item.StockQuantity > item.OutboundQuantity && materielInfo.Business_qty < materielInfo.MinQty)
{
Qty += materielInfo.BoxQty;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs"
index b20b3f5..1244572 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs"
@@ -19,7 +19,7 @@
_inventoryInfoService = inventoryInfoService;
}
//姣忛殧1绉掓墽琛屼竴娆�
- [Invoke(Begin = "2025-09-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
+ [Invoke(Begin = "2025-09-01", Interval = 1000 * 60, IsEnabled = true, SkipWhileExecuting = true)]
public void Run()
{
//鍐峰簱
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs"
index 868f5f1..5153ee3 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs"
@@ -12,7 +12,7 @@
_medicineGoodsServices = medicineGoodsServices;
}
//姣忛殧1绉掓墽琛屼竴娆�
- [Invoke(Begin = "2025-09-01", Interval = 1000 * 60, IsEnabled = false, SkipWhileExecuting = true)]
+ [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled = true, SkipWhileExecuting = true)]
public void Run()
{
_medicineGoodsServices.GetMedicineGoodsInfom();
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs"
index 82734e0..36bd893 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs"
@@ -11,11 +11,11 @@
_business = business;
}
//姣忛殧1绉掓墽琛屼竴娆�
- [Invoke(Begin = "2025-09-01", Interval = 1000 * 10, IsEnabled =false,SkipWhileExecuting = true)]
+ [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled =true,SkipWhileExecuting = true)]
public void Run()
{
- //_business.GetUpstreamOrder();
- //_business.EdiIn();
+ _business.GetUpstreamOrder();
+ _business.EdiIn();
_business.CompleteAllOrders();
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
index b28c89c..672c4ad 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs"
@@ -11,7 +11,7 @@
_business = business;
}
//姣忛殧1绉掓墽琛屼竴娆�
- [Invoke(Begin = "2025-09-01", Interval = 1000 * 10, IsEnabled = false, SkipWhileExecuting = true)]
+ [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled = true, SkipWhileExecuting = true)]
public void Run()
{
//鑾峰彇涓婃父鍑哄簱鍗曟暟鎹�
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 4e1d9b6..417658e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -17,6 +17,7 @@
//"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;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_WMSDBF_Z22;User ID=sa;Password=48PYX_h7KS@f;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
@@ -30,6 +31,6 @@
"ApiName": "WIDESEA",
"ExpMinutes": 120,
"DBSeedEnable": false, //鏄惁鍚敤鏁版嵁搴撶瀛愭暟鎹紝鍒涘缓琛�
- "PDAVersion": "8",
+ "PDAVersion": "10",
"WebSocketPort": 9296
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
index 9fd9a28..3e717b4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
@@ -95,12 +95,7 @@
type: "int",
span: 8
},
- {
- field: "layer",
- title: "璐т綅灞�",
- type: "int",
- span: 8
- }
+
],
[
{
@@ -109,13 +104,19 @@
type: "int",
span: 12
},
- {
- field: "locationType",
- title: "璐т綅绫诲瀷",
- type: "select",
- span: 12,
- data: [],
- dataKey: "locationTypeEnum",
+ // {
+ // field: "locationType",
+ // title: "璐т綅绫诲瀷",
+ // type: "select",
+ // span: 12,
+ // data: [],
+ // dataKey: "locationTypeEnum",
+ // }
+ {
+ field: "layer",
+ title: "璐т綅灞�",
+ type: "int",
+ span: 8
}
],
[
@@ -136,14 +137,14 @@
data: [],
}
],
- [
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- span: 24
- }
- ]
+ // [
+ // {
+ // field: "remark",
+ // title: "澶囨敞",
+ // type: "string",
+ // span: 24
+ // }
+ // ]
]);
const searchFormFields = ref({
// warehouseId: "",
@@ -167,13 +168,12 @@
],
[
{ title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
- { title: "璐т綅绫诲瀷", field: "locationType", type: "select", dataKey: "locationTypeEnum", data: [] },
+ // { title: "璐т綅绫诲瀷", field: "locationType", type: "select", dataKey: "locationTypeEnum", data: [] },
{ title: "璐т綅鐘舵��", field: "locationStatus", type: "select", dataKey: "locationStatusEnum",data: []},
-
+ { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select", data: [], dataKey:"status" },
],
[
- { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select", data: [], dataKey:"status" },
{ title: "琛�", field: "row", type: "int" },
{ title: "鍒�", field: "column", type: "int" },
{ title: "灞�", field: "layer", type: "int" }
@@ -257,15 +257,15 @@
width: 100,
align: "left",
},
- {
- field: "locationType",
- title: "璐т綅绫诲瀷",
- type: "select",
- width: 120,
- align: "left",
- data: [],
- bind: { key: "locationTypeEnum", data: [] }
- },
+ // {
+ // field: "locationType",
+ // title: "璐т綅绫诲瀷",
+ // type: "select",
+ // width: 120,
+ // align: "left",
+ // data: [],
+ // bind: { key: "locationTypeEnum", data: [] }
+ // },
{
field: "locationStatus",
title: "璐т綅鐘舵��",
@@ -284,13 +284,13 @@
data: [],
bind: { key: "status", data: [] },
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
+ // {
+ // field: "remark",
+ // title: "澶囨敞",
+ // type: "string",
+ // width: 150,
+ // align: "left",
+ // },
{
field: "creater",
title: "鍒涘缓浜�",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
index 933da27..6daa38a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
@@ -57,13 +57,13 @@
const editFormOptions = ref([
// 绗竴琛岋細鍏抽敭淇℃伅
[
- {
- title: "鐗╂枡缂栧彿",
- field: "materielCode",
- type: "string",
- span: 12,
- required: true,
- },
+ // {
+ // title: "鐗╂枡缂栧彿",
+ // field: "materielCode",
+ // type: "string",
+ // span: 12,
+ // required: true,
+ // },
{
title: "鐗╂枡鍚嶇О",
field: "materielName",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
index 7e86186..d43aa0e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
@@ -275,8 +275,8 @@
width: 120,
align: "left",
bind: { key: "warehouseNuber", data: [] },
- edit:{type:'select',dataKey:'warehouseNuber',data:[]},
- edit:{type:""}
+ // edit:{type:'select',dataKey:'warehouseNuber',data:[]},
+ // edit:{type:""}
},
{
field: "goods_no",
@@ -285,7 +285,7 @@
width: 150,
align: "left",
required: true,
- edit:{type:""},
+ // edit:{type:""},
bind: { key: "MaterielNames", data: [] },
},
{
@@ -296,7 +296,7 @@
align: "left",
bind: { key: "medicineGoods", data: [] },
required: true,
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -306,7 +306,7 @@
width: 120,
align: "left",
required: true,
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
@@ -315,7 +315,7 @@
type: "decimal",
width: 120,
align: "left",
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
@@ -325,7 +325,7 @@
width: 120,
align: "left",
required: true,
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -334,7 +334,7 @@
type: "string",
width: 120,
align: "left",
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -344,7 +344,7 @@
width: 120,
align: "left",
// bind: { key: "orderDetailStatus", data: [] },
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -354,7 +354,7 @@
width: 120,
align: "left",
bind: { key: "syncStatus", data: [] },
- edit:{type:'select',dataKey:'syncStatus',data:[]}
+ // edit:{type:'select',dataKey:'syncStatus',data:[]}
},
{
field: "creater",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
index 1c1c7d7..27556a3 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
@@ -264,7 +264,7 @@
width: 120,
align: 'left',
bind: { key: "warehouseNuber", data: [] },
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -274,7 +274,7 @@
width: 150,
align: "left",
required: true,
- edit:{type:""},
+ // edit:{type:""},
bind: { key: "MaterielNames", data: [] },
},
{
@@ -285,7 +285,7 @@
require: true,
align: 'left',
bind: { key: "medicineGoods", data: [] },
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'order_qty',
@@ -294,7 +294,7 @@
width: 100,
require: true,
align: 'left',
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
field: 'order_Outqty',
@@ -303,7 +303,7 @@
width: 100,
require: true,
align: 'left',
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
field: 'batch_num',
@@ -312,7 +312,7 @@
width: 120,
require: true,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'exp_date',
@@ -320,7 +320,7 @@
type: 'string',
width: 120,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'ootDetailStatus',
@@ -328,7 +328,7 @@
type: 'string',
width: 120,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'status',
@@ -337,7 +337,7 @@
width: 120,
align: 'left',
bind: { key: "syncStatus", data: [] },
- edit:{type:'select',dataKey:'syncStatus',data:[]}
+ // edit:{type:'select',dataKey:'syncStatus',data:[]}
},
{
field: 'creater',
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
index 62b29fc..6f8f0ce 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
@@ -243,6 +243,7 @@
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
+ hidden: true,
width: 90,
align: "left",
},
@@ -342,12 +343,14 @@
field: "productionDate",
title: "鐢熶骇鏃ユ湡",
type: "date",
+ hidden: true,
width: 120,
align: "left",
},
{
field: "shelfLife",
title: "淇濊川鏈熷ぉ鏁�",
+ hidden: true,
type: "number",
width: 120,
align: "left",
@@ -363,6 +366,7 @@
field: "alarmInformation",
title: "鎶ヨ淇℃伅",
type: "string",
+ hidden: true,
width: 120,
align: "left",
},
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
index 9e83ef2..795f4e4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
@@ -104,6 +104,7 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
+ hidden: true,
width: 120,
align: "left",
},
@@ -112,6 +113,7 @@
title: "鎵樼洏缂栧彿",
type: "string",
width: 120,
+ hidden: true,
align: "left",
},
{
@@ -200,6 +202,7 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
+ hidden: true,
width: 160,
align: "left",
},
@@ -208,6 +211,7 @@
title: "鍒涘缓浜�",
type: "string",
width: 90,
+ hidden: true,
align: "left",
},
{
@@ -215,6 +219,7 @@
title: "鍒涘缓鏃堕棿",
type: "datetime",
width: 160,
+ hidden: true,
align: "left",
},
{
--
Gitblit v1.9.3