From 60a50d7a976f33a172421546fd891f33a21043e5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 29 十月 2025 11:50:22 +0800
Subject: [PATCH] 优化
---
新建文件夹/PDA/pages/stash/outboundorderDetail.vue | 2 +-
新建文件夹/PDA/pages/stash/CheckoutorderDetail.vue | 2 +-
新建文件夹/WMS/src/extension/inbound/inboundOrder.js | 8 +++++---
新建文件夹/WMS/src/extension/outbound/outboundOrder.js | 7 +++++--
新建文件夹/PDA/pages/stash/inboundorderDetail.vue | 2 +-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 2 +-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 2 +-
新建文件夹/WMS/src/views/Index.vue | 2 +-
8 files changed, 16 insertions(+), 11 deletions(-)
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 2401959..4f4aa81 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"
@@ -120,7 +120,7 @@
// 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
- delta: 2
+ delta: 1
});
}, 500);
} 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 589e8d4..2dc59d9 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"
@@ -117,7 +117,7 @@
// 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
- delta: 2
+ delta:1
});
}, 500);
} else {
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 43f4c6a..72f2be3 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"
@@ -159,7 +159,7 @@
// 鐢ㄦ埛鐐瑰嚮纭畾
setTimeout(() => {
uni.navigateBack({
- delta: 2
+ delta: 1
});
}, 500);
} else {
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 e079d3f..2013638 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"
@@ -362,7 +362,6 @@
if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵item.goods_no}銆戠殑淇℃伅");
if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑灞炴�у垎绫�");
- if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
#endregion
#region 澶т欢
if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -382,6 +381,7 @@
#endregion
else
{
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
if (materielInfo.MinQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绔嬪簱鏈�浣庡簱瀛樻暟");
Dt_CabinOrderDetail orderDetail = null;
var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
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 90251da..fb4045a 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"
@@ -263,7 +263,7 @@
ERPStockQuantity = 0,
Status = false,
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
- ValidityPeriod = inventoryInfo.ValidityPeriod,
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
Remark = "鑷姩鍒涘缓"
};
BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/inbound/inboundOrder.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/inbound/inboundOrder.js"
index 8f7553b..4b13a4b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/inbound/inboundOrder.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/inbound/inboundOrder.js"
@@ -22,10 +22,12 @@
Bt.onClick = function () {
let rows = this.$refs.table.getSelected();
if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- const allIds = rows.map(item => item.id);
-
+ if(rows.length>1) return this.$error("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+ // const allIds = rows.map(item => item.id);
+ const id=rows[0].id
+
// 杩欓噷娣诲姞浣犵殑涓氬姟閫昏緫
- this.http.post("api/YourApi", allIds).then((x) => {
+ this.http.post(`/api/CabinOrder/FinishInOrder?key${id}`).then((x) => {
if (x.status) {
this.$Message.success('鎿嶄綔鎴愬姛');
this.refresh();
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
index aace3e5..ac5be69 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
@@ -1,6 +1,7 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
import gridBody from './extend/outOrderDetail.vue'
+import http from '../../api/http';
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
@@ -23,10 +24,12 @@
Bt.onClick = function () {
let rows = this.$refs.table.getSelected();
if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- const allIds = rows.map(item => item.id);
+ if (rows.length>1)return this.$error("鍙兘閫夋嫨涓�鏉℃暟鎹�")
+ const id=rows[0].id;
+ //const allIds = rows.map(item => item.id);
// 杩欓噷娣诲姞浣犵殑涓氬姟閫昏緫
- this.http.post("api/YourApi", allIds).then((x) => {
+ this.http.post(`/api/DeliveryOrder/FinishOutOrder?key=${id}`).then((x) => {
if (x.status) {
this.$Message.success('鎿嶄綔鎴愬姛');
this.refresh();
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
index 7dc109d..86268bf 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Index.vue"
@@ -321,7 +321,7 @@
messageList.push(data);
ElNotification({
title: data.title,
- message: h("i", { style: "color: teal" }, data.message),
+ message: h("i", { style: "color: red" }, data.message),
position: "bottom-right",
});
};
--
Gitblit v1.9.3