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; } 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> 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 布局 */ 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',},], 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="" /> 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',},], 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="" /> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs
@@ -139,6 +139,7 @@ /// </summary> public class LocationViewOutput { public string PlaceCode { get; set; } /// <summary> /// 进入时间 /// </summary> 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>
@@ -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>
