From 7867ee16131331fe56d972a6405516786c6b019c Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 17:40:29 +0800
Subject: [PATCH] 大屏

---
 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue                            |   36 ++++++++++--
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs                    |    7 ++
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue                      |    4 
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs |    9 +-
 LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue                               |    4 
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue       |    6 +-
 LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue                |    6 +-
 LuLiScreen/index3.html                                                                                   |    6 -
 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue             |   96 ++++++++++++++++++++------------
 9 files changed, 114 insertions(+), 60 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
index 65f00ad..a57b80b 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/propDetail.vue
@@ -7,26 +7,42 @@
 			</div>
 		</template>
 		<!-- <p >瀹瑰櫒缂栧彿锛歿{ containerNo }}</p> -->
-		<el-table ref="tableRefWmsStockQuan" :data="materialList" style="width: 100%" tooltip-effect="light" row-key="id"
-			border="">
-			<el-table-column type="index" fixed="left" label="搴忓彿" width="55" align="center" />
-			<el-table-column prop="areaName" fixed="left" width="100" label="鎵�鍦ㄥ簱鍖�" show-overflow-tooltip="" />
-			<el-table-column prop="placeName" width="100" label="鎵�鍦ㄥ簱浣�" show-overflow-tooltip="" />
-			<el-table-column prop="materialCode"  min-width="120" label="鐗╂枡缂栧彿" show-overflow-tooltip="" />
-			<el-table-column prop="materialName" min-width="120" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" />
-			<el-table-column prop="materialTypeName" label="鐗╂枡绫诲瀷" show-overflow-tooltip="" />
-			<el-table-column prop="quantity" label="搴撳瓨鏁�" show-overflow-tooltip="" />
-			<el-table-column prop="snCode" width="180" label="璺熻釜鐮�" show-overflow-tooltip="" />
-			<el-table-column prop="containerCode" width="100" label="瀹瑰櫒缂栧彿" show-overflow-tooltip="" />
-			<el-table-column prop="containerTypeName" label="瀹瑰櫒绫诲瀷" show-overflow-tooltip="" />
-		
+		<el-table ref="tableRefWmsStockQuan" :data="materialList" style="width: 100%" tooltip-effect="light" row-key="id" border="">
+			<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+			<el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
+			<el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" show-overflow-tooltip="" />
+			<el-table-column prop="upi" label="閮ㄤ欢鏉$爜" show-overflow-tooltip="" />
+			<el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+			<el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
+			<el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+			<el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
+			<el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
+			<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
+			<el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
+			<el-table-column prop="stockStatus" label="搴撳瓨鐘舵��" min-width="140"   show-overflow-tooltip="">
+				<template #default="scope">
+					<el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
+				</template>
+			</el-table-column>
+			<!-- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" min-width="140"  show-overflow-tooltip="" /> -->
+			<el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
+			<el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
+			<el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" show-overflow-tooltip="" />
+			<el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
+				<template #default="scope">
+					<el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
+			<el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
+			<el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" show-overflow-tooltip="" />
+			<el-table-column prop="remarks" label="澶囨敞" show-overflow-tooltip="" />
+			<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" show-overflow-tooltip="" />
+			<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" show-overflow-tooltip="" />
+			<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
+			<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
 		</el-table>
-		<!-- <el-descriptions title="" :column="1" border v-if="materialList.length>0">
-			<el-descriptions-item v-for="(item,index) in  materialList" :key="index" :label="item.materialCode"
-				label-align="center" align="center" label-class-name="my-label" class-name="my-content">
-				{{Number(item.quantity).toFixed(3)  }} 
-			</el-descriptions-item>
-		</el-descriptions> -->
+
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="dialogVisible = false">鍏抽棴</el-button>
@@ -37,29 +53,38 @@
 	</el-dialog>
 </template>
 <script lang="ts" setup>
-import { ref, defineExpose } from 'vue'
+import { ref, defineExpose } from 'vue';
 import { ElMessage } from 'element-plus';
-import { pageWmsLocationViewDetail, pageWmsStockQuan } from '/@/api/main/ReportCenter/wmsStockQuan';
-const dialogVisible = ref(false);
-const materialList = ref<any>([]);
+import { listWmsStockQuan, pageWmsLocationViewDetail, pageWmsStockQuan } from '/@/api/main/ReportCenter/wmsStockQuan';
+import commonFunction from '/@/utils/commonFunction';
+import { getTagUseable } from '/@/utils/formate';
+const { getEnumDesc } = commonFunction();
+import { getAPI } from '/@/utils/axios-utils';
+import { SysEnumApi } from '/@/api-services/api';
+const getEnumStockStatusData_Index = ref<any>([]);
 
 //搴撲綅缂栧彿
 const containerNo = ref('');
+const dialogVisible = ref(false);
+const materialList = ref<any>([]);
+const getEnumPlaceStatusData_Index = ref<any>([]);
+const getEnumQCStatusData_Index = ref<any>([]);
+const getEnumLockStatusData_Index = ref<any>([]);
+
 //鎵撳紑绐楀彛
 const openDialog = async (type: string) => {
-	var res = await pageWmsLocationViewDetail({
-		//containerCode: type,
-		placeCode:type,//鏀逛负鏌ヨ搴撲綅涓婂叏閮ㄧ殑搴撳瓨
-		page: 1,
-		pageSize: 10
+	getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
+    getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
+debugger
+	var res = await listWmsStockQuan({
+		placeCode: type.placeCode //鏀逛负鏌ヨ搴撲綅涓婂叏閮ㄧ殑搴撳瓨
 	});
 	if (res.data.code == 200) {
-
-		materialList.value = res.data.result?.items;
-		if (materialList.value.length > 0) {
-			dialogVisible.value = true;
-			containerNo.value = res.data.result?.items[0].containerCode;
-		}
+		dialogVisible.value = true;
+		materialList.value = res.data.result;
+		// if (materialList.value.length > 0) {
+		// 	containerNo.value = res.data.result[0].containerCode;
+		// }
 	}
 };
 //鍏抽棴绐楀彛
@@ -68,6 +93,5 @@
 };
 // 鏆撮湶鏂规硶
 defineExpose({ openDialog });
-
 </script>
-<style lang="less" scoped></style>
\ No newline at end of file
+<style lang="less" scoped></style>
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 0040df2..aa3c864 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -58,9 +58,11 @@
 						<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.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
+									<span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
 										<!-- {{ cell.laneNo }} -->
-										{{ cell.layerNo }}{{ cell.columnNo }}
+										<!-- PlaceCode: -->
+										{{ cell.placeCode }} 
+										<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
 									</span>
 								</div>
 							</div>
@@ -68,7 +70,8 @@
 								<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.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
 										<!-- {{ cell.laneNo }} -->
-										{{ cell.layerNo }}{{ cell.columnNo }}
+										{{ cell.placeCode }} 
+										<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
 									</span>
 								</div>
 							</div>
@@ -76,7 +79,8 @@
 								<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), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
 										<!-- {{ cell.laneNo }} -->
-										{{ cell.layerNo }}{{ cell.columnNo }}
+										{{ cell.placeCode }} 
+										<!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
 									</span>
 								</div>
 							</div>
@@ -103,10 +107,13 @@
 				<!-- <content-view :contentData="dataList"></content-view> -->
 			</div>
 		</el-card>
+
+			<!-- 璇︽儏寮规 -->
+			<prop-detail ref="propDetailRef"></prop-detail>
 	</div>
 </template>
 <script lang="ts" setup>
-import { nextTick, onMounted, ref } from 'vue';
+import { getCurrentInstance, nextTick, onMounted, ref } from 'vue';
 //import SearchBar from '@/components/SearchBar.vue'
 import { getStorageView } from '/@/api/main/ReportCenter/storageView';
 
@@ -114,6 +121,8 @@
 import ContentView from './component/ContentView.vue';
 import { ElMessage } from 'element-plus';
 import { handleSlectDataWmsArea } from '/@/utils/selectData';
+import PropDetail from './component/propDetail.vue';
+const { proxy} :any = getCurrentInstance();// 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
 
 const showAdvanceQueryUIWmsStockQuan = ref(false);
 // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
@@ -391,6 +400,21 @@
 console.log(66666666);
 
 console.log(storageList.value);
+
+const dialogVisible = ref(false); // 寮规鍙鎬�
+
+const handleClick = (row: any, column: any) => {
+	console.log(row, column);
+	proxy.$refs['propDetailRef'].openDialog(row);
+};
+
+const openDialog = () => {
+	dialogVisible.value = true; // 鎵撳紑寮规
+};
+
+const handleClose = () => {
+	dialogVisible.value = false; // 鍏抽棴寮规
+};
 </script>
 <style lang="less" scoped>
 .msi-content {
@@ -447,7 +471,7 @@
 .t1 {
 	margin: 10px 0 2px 0;
 	font-size: 16px !important;
-	padding-bottom:10px
+	padding-bottom: 10px;
 }
 .textK {
 	display: flex; /* 浣跨敤 Flexbox 甯冨眬 */
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
index 24f2284..e3725a6 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -13,8 +13,8 @@
 						<el-input v-model="ruleForm.id" />
 					</el-form-item>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閮ㄤ欢鏉$爜" prop="uPI">
-							<el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+						<el-form-item label="閮ㄤ欢鏉$爜" prop="upi">
+							<el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
 							
 						</el-form-item>
 						
@@ -304,7 +304,7 @@
 	const ruleForm = ref<any>({});
 	//鑷娣诲姞鍏朵粬瑙勫垯
 	const rules = ref<FormRules>({
-		uPI: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+		upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
 		planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
 		orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
 		upiStatus: [{required: true, message: '璇烽�夋嫨鏉挎枡鐘舵�侊紒', trigger: 'change',},],
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 1958672..6e9d331 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -11,7 +11,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
             <el-form-item label="閮ㄤ欢鏉$爜">
-              <el-input v-model="queryParamsMes_BatchOrderUPI_New.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+              <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
               
             </el-form-item>
           </el-col>
@@ -250,7 +250,7 @@
                 @sort-change="sortChangeMes_BatchOrderUPI_New"
 				border="">
         <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
-        <el-table-column prop="uPI" label="閮ㄤ欢鏉$爜"  show-overflow-tooltip="" />
+        <el-table-column prop="upi" label="閮ㄤ欢鏉$爜"  show-overflow-tooltip="" />
         <el-table-column prop="planNo" label="鎵规鍙�"  show-overflow-tooltip="" />
         <el-table-column prop="orderId" label="璁㈠崟鍙�"  show-overflow-tooltip="" />
         <el-table-column prop="info5" label="鐢熶骇鍗曞彿"  show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
index cf007fc..ce8830c 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
@@ -27,8 +27,8 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閮ㄤ欢鏉$爜" prop="uPI">
-							<el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+						<el-form-item label="閮ㄤ欢鏉$爜" prop="upi">
+							<el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
 							
 						</el-form-item>
 						
@@ -196,7 +196,7 @@
 	//鑷娣诲姞鍏朵粬瑙勫垯
 	const rules = ref<FormRules>({
 		taskNo: [{required: true, message: '璇疯緭鍏ヤ换鍔″彿锛�', trigger: 'blur',},],
-		uPI: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+		upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
 		length: [{required: true, message: '璇疯緭鍏ラ暱锛�', trigger: 'blur',},],
 		width: [{required: true, message: '璇疯緭鍏ュ锛�', trigger: 'blur',},],
 		thk: [{required: true, message: '璇疯緭鍏ュ帤锛�', trigger: 'blur',},],
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
index 6c153cb..dad6e80 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
             <el-form-item label="閮ㄤ欢鏉$爜">
-              <el-input v-model="queryParamsWmsRbLineTask.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+              <el-input v-model="queryParamsWmsRbLineTask.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
               
             </el-form-item>
           </el-col>
@@ -162,7 +162,7 @@
         <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
         <el-table-column prop="taskNo" label="浠诲姟鍙�"  show-overflow-tooltip="" />
         <el-table-column prop="taskName" label="浠诲姟鍚嶇О"  show-overflow-tooltip="" />
-        <el-table-column prop="uPI" label="閮ㄤ欢鏉$爜"  show-overflow-tooltip="" />
+        <el-table-column prop="upi" label="閮ㄤ欢鏉$爜"  show-overflow-tooltip="" />
         <el-table-column prop="length" label="闀�"  show-overflow-tooltip="" />
         <el-table-column prop="width" label="瀹�"  show-overflow-tooltip="" />
         <el-table-column prop="thk" label="鍘�"  show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs
index e321bb0..1aba23b 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs
@@ -139,11 +139,12 @@
 /// </summary>
 public class LocationViewOutput
 {
-        /// <summary>
-        /// 杩涘叆鏃堕棿
-        /// </summary>
+    public string PlaceCode { get; set; }
+    /// <summary>
+    /// 杩涘叆鏃堕棿
+    /// </summary>
 
-        public DateTime? InTime { get; set; }
+    public DateTime? InTime { get; set; }
 
         /// <summary>
         /// 閮ㄤ欢鏉$爜
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs
index 9ba7dba..7a66312 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs
@@ -11,6 +11,13 @@
     public class V_Station_Quan : WmsBasePlace
     {
         /// <summary>
+        /// 搴撲綅缂栫爜
+        /// </summary>
+        [SugarColumn(ColumnName = "PlaceCode", ColumnDescription = "搴撲綅缂栫爜", Length = 50)]
+
+        public string PlaceCode { get; set; }
+
+        /// <summary>
         /// 杩涘叆鏃堕棿
         /// </summary>
 
diff --git a/LuLiScreen/index3.html b/LuLiScreen/index3.html
index b88c36a..7da296d 100644
--- a/LuLiScreen/index3.html
+++ b/LuLiScreen/index3.html
@@ -21,14 +21,12 @@
 <body>
     <div class="container-flex" tabindex="0" hidefocus="true">
         <div class="box-center">
-            <p class="titleHt title_lt">褰撳墠鐧婚檰浜�:
+            <p class="titleHt title_lt">褰撳墠鎿嶄綔浜�:
                 <span id="idLoginName"> </span>
 
             </p>
-            <p class="titleHt title_rt">鐧诲綍鏃堕棿:
+            <p class="titleHt title_rt">鎿嶄綔鏃堕棿:
                 <span id="idLoginTime"> </span>
-
-
             </p>
             <div class="center-top">
                 <h1>椴佷附鏈ㄤ笟鍖呰绾�</h1>

--
Gitblit v1.9.3