From f3a78b9ef7ec02b255dc52bf2b85f52c1cefa777 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 14 12月 2024 16:36:08 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Pda/components/buttonModal.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue | 55 +++++------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 9 +++
CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs | 30 +++++-----
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue | 11 ++-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs | 30 +++++-----
LA24030_LuLiPackageLine_Pda/manifest.json | 2
7 files changed, 66 insertions(+), 73 deletions(-)
diff --git a/CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs b/CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs
index 020e610..90c5844 100644
--- a/CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs
+++ b/CC/iWareModel/EnumType/WMS/WmsPlaceEnum.cs
@@ -181,23 +181,23 @@
[Description("姝ｅ父")]
姝ｅ父 = 1,
- /// <summary>
- /// 灏佸瓨
- /// </summary>
- [Description("灏佸瓨")]
- 灏佸瓨 = 2,
+ ///// <summary>
+ ///// 灏佸瓨
+ ///// </summary>
+ //[Description("灏佸瓨")]
+ //灏佸瓨 = 2,
- /// <summary>
- /// 绂佸嚭 --涓嶇敤浜�
- /// </summary>
- [Description("绂佸嚭")]
- 绂佸嚭 = 3,
+ ///// <summary>
+ ///// 绂佸嚭 --涓嶇敤浜�
+ ///// </summary>
+ //[Description("绂佸嚭")]
+ //绂佸嚭 = 3,
- /// <summary>
- /// 绂佸叆 --涓嶇敤浜�
- /// </summary>
- [Description("绂佸叆")]
- 绂佸叆 = 4,
+ ///// <summary>
+ ///// 绂佸叆 --涓嶇敤浜�
+ ///// </summary>
+ //[Description("绂佸叆")]
+ //绂佸叆 = 4,
/// <summary>
/// 閿佸畾
diff --git a/LA24030_LuLiPackageLine_Pda/components/buttonModal.vue b/LA24030_LuLiPackageLine_Pda/components/buttonModal.vue
index 474d492..dc92540 100644
--- a/LA24030_LuLiPackageLine_Pda/components/buttonModal.vue
+++ b/LA24030_LuLiPackageLine_Pda/components/buttonModal.vue
@@ -113,6 +113,6 @@
// // font-size: 16px !important;
// }
uni-button{
- padding-right: 10px !important;
+ padding-right: 5px !important;
}
</style>
diff --git a/LA24030_LuLiPackageLine_Pda/manifest.json b/LA24030_LuLiPackageLine_Pda/manifest.json
index 1ce6253..0fe8119 100644
--- a/LA24030_LuLiPackageLine_Pda/manifest.json
+++ b/LA24030_LuLiPackageLine_Pda/manifest.json
@@ -2,7 +2,7 @@
"name" : "LuLiMuYe_Package_Pda",
"appid" : "__UNI__28D87EB",
"description" : "2024.12.14",
- "versionName" : "1.0.4",
+ "versionName" : "1.0.5",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
index e9f2c91..b497832 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -56,25 +56,27 @@
<count-view :countData="countList"></count-view>
<div class="box100">
<div v-for="(item, index) in dataList" :key="index" class="box100Inner">
- <p class="t1">{{ item.laneNo }}#绔嬩綋搴�</p>
+ <p class="t1">{{ item.laneNo }}#鎺�</p>
<div class="storage-grid">
<div class="row rowMy0">
- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
- <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
+ <!-- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20"> -->
+ <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
{{ cell.placeCode }}
</span>
</div>
</div>
<div class="row rowMy1">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 20 && cellIndex < 40">
- <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
{{ cell.placeCode }}
</span>
</div>
</div>
<div class="row rowMy2">
- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
- <span class="textK" :style="{ background: setBgColor(cell.stockStatus), boxShadow: '0 1px 1px' + setBgColor(cell.stockStatus) }" @click="handleClick(cell)">
+ <!-- <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60"> -->
+ <div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus,cell.upi), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus,cell.upi) }" @click="handleClick(cell)">
<!-- {{ cell.laneNo }} -->
{{ cell.placeCode }}
<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
@@ -123,43 +125,20 @@
// }
-const setBgColor = (type: number): string => {
+const setBgColor = (type: number,upi:string): string => {
let color = '';
- switch (type) {
-
- case 1:
+ //debugger
+ if(upi!=null){
color = '#2BA6FF'; //钃濊壊 鍦ㄥ簱
- break;
-
- case 2:
+ return color;
+ }
+ switch (type) {
+ case 5:
color = '#FF0000'; //绾㈣壊 宸插喕缁�
break;
-default:
+ default:
color = '#F6C285'; //姗樿壊 姝ｅ父
break;
- // case 3:
- // color = '#FFFF00'; //榛勮壊 绂佸嚭
- // break;
-
-
- // case 1:
- // color = '#F6C285'; //姗樿壊 姝ｅ父#F18201
- // break;
- // case 2:
- // color = '#FF0000'; //绾㈣壊 閿佸畾
- // break;
- // // case 2:
- // // color = '#2BA6FF'; //钃濊壊 灏佸瓨
- // break;
- // case 3:
- // color = '#FFFF00'; //榛勮壊 绂佸嚭
- // break;
-
- // // case 4:
- // // color = '#A2A2A2'; //鐏拌壊 绂佸叆
- // // break;
-
-
}
return color;
};
@@ -239,7 +218,7 @@
{
type: 2,
title: '閿佸畾搴撲綅:',
- count: result.filter((item: any) => item.stockStatus == 2).length || 0,
+ count: result.filter((item: any) => item.placeStatus == 5).length || 0,
},
];
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
index 0acd429..d9ad560 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
@@ -507,7 +507,9 @@
}
);
handleQuery();
- //ElMessage.success('榻愬寘鍑哄簱璇锋眰鎴愬姛');
+ if(ret.data.type=="success"){
+ ElMessage.success('榻愬寘鍑哄簱璇锋眰鎴愬姛');
+ }
loading.value = false;
})
.catch(() => ElMessage.info('宸插彇娑�'));
@@ -531,8 +533,11 @@
}
);
handleQuery();
- //ElMessage.success('寮哄埗鍑哄簱璇锋眰鎴愬姛');
- loading.value = false;
+ if(ret.data.type=="success"){
+ ElMessage.success('寮哄埗鍑哄簱璇锋眰鎴愬姛');
+ }
+
+ loading.value = false;
})
.catch(() => ElMessage.info('宸插彇娑�'));
};
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs
index e12cfa4..94ddfbe 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsBase/WmsPlaceEnum.cs
@@ -178,23 +178,23 @@
[Description("姝ｅ父")]
姝ｅ父 = 1,
- /// <summary>
- /// 灏佸瓨
- /// </summary>
- [Description("灏佸瓨")]
- 灏佸瓨 = 2,
+ ///// <summary>
+ ///// 灏佸瓨
+ ///// </summary>
+ //[Description("灏佸瓨")]
+ //灏佸瓨 = 2,
- /// <summary>
- /// 绂佸嚭 --涓嶇敤浜�
- /// </summary>
- [Description("绂佸嚭")]
- 绂佸嚭 = 3,
+ ///// <summary>
+ ///// 绂佸嚭 --涓嶇敤浜�
+ ///// </summary>
+ //[Description("绂佸嚭")]
+ //绂佸嚭 = 3,
- /// <summary>
- /// 绂佸叆 --涓嶇敤浜�
- /// </summary>
- [Description("绂佸叆")]
- 绂佸叆 = 4,
+ ///// <summary>
+ ///// 绂佸叆 --涓嶇敤浜�
+ ///// </summary>
+ //[Description("绂佸叆")]
+ //绂佸叆 = 4,
/// <summary>
/// 閿佸畾
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index 831130c..1f00b00 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -95,6 +95,11 @@
//鏇存柊鐘舵��
foreach (var quan in quanList)
{
+ if (quan.StockStatus != StockStatusEnum.鍦ㄥ簱 && quan.StockStatus != StockStatusEnum.宸插喕缁�)
+ {
+ throw Oops.Oh($"閮ㄤ欢鏉＄爜{quan.Upi}鐨勫簱瀛樼姸鎬佷笉鏄�'{StockStatusEnum.鍦ㄥ簱.ToString()}鎴杮StockStatusEnum.宸插喕缁�.ToString()}'鐘舵��");
+ }
+
quan.StockStatus = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�;
quan.StockStatusName = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�.ToString();
quan.UpdateTime = DateTime.Now;
@@ -153,6 +158,10 @@
//鏇存柊鐘舵��
foreach (var quan in quanList)
{
+ if (quan.StockStatus != StockStatusEnum.鍦ㄥ簱 && quan.StockStatus != StockStatusEnum.宸插喕缁�)
+ {
+ throw Oops.Oh($"閮ㄤ欢鏉＄爜{quan.Upi}鐨勫簱瀛樼姸鎬佷笉鏄�'{StockStatusEnum.鍦ㄥ簱.ToString()}鎴杮StockStatusEnum.宸插喕缁�.ToString()}'鐘舵��");
+ }
quan.StockStatus = StockStatusEnum.榻愬寘寰呭嚭搴�;
quan.StockStatusName = StockStatusEnum.榻愬寘寰呭嚭搴�.ToString();
quan.UpdateTime = DateTime.Now;
--
Gitblit v1.9.3