From adf622258d11cff158aa62a0db40346a792b8d8a Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 01 12月 2024 13:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue | 43 ++++-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 45 ++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs | 23 +++
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/Dto/WmsBasePlaceOutput.cs | 9
LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue | 6
LuLiScreen/index3.html | 31 ++--
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue | 105 ++++++--------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue | 13 -
LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue | 7
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/View/WmsStockQuan/V_Station_Quan.cs | 7 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 4
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/ReportCenter/storageView/component/propDetail.vue | 100 ++++++++-----
16 files changed, 251 insertions(+), 156 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
index a11bf19..79b2d9f 100644
--- a/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
+++ b/LA24030_LuLiPackageLine_Web/src/components/printTableCkd.vue
@@ -41,17 +41,16 @@
<table cellspacing="0" cellpadding="0">
<tr class="middle_first">
<td class="middle_tree">缂栧彿</td>
- <td class="middle_one">鏉愭枡</td>
+ <td class="middle_two">鎵规</td>
<td class="middle_two">閮ㄤ欢鍚嶇О</td>
<td class="middle_four">灏哄</td>
<td class="middle_one">閮ㄤ欢鏉＄爜</td>
</tr>
<tr class="middle_first" v-for="(item, index) in itemW" :key="index">
<td class="middle_tree">{{ item.num }}</td>
-
- <td class="middle_one">
+ <td class="middle_two">
<div>
- <!-- {{ item.planNo }} -->
+ {{ item.planNo }}
</div>
</td>
<td class="middle_two">
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..6e277de 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
@@ -3,30 +3,45 @@
<el-dialog v-model="dialogVisible" width="70%" @close="closeDialog">
<template #header>
<div style="color: #fff">
- <span>搴撲綅璇︽儏</span>
+ <span>搴撲綅{{placeCode}}璇︽儏 </span>
</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 +52,37 @@
</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 placeCode = ref('');
+const dialogVisible = ref(false);
+const materialList = 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
+placeCode.value =type.placeCode
+ 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 +91,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..db71e2e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -58,25 +58,29 @@
<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>
<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.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 }}
+ {{ cell.placeCode }}
+ <!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
</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.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 }}
+ {{ 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,20 @@
console.log(66666666);
console.log(storageList.value);
+
+const dialogVisible = ref(false); // 寮规鍙鎬�
+
+const handleClick = (row: any) => {
+ proxy.$refs['propDetailRef'].openDialog(row);
+};
+
+const openDialog = () => {
+ dialogVisible.value = true; // 鎵撳紑寮规
+};
+
+const handleClose = () => {
+ dialogVisible.value = false; // 鍏抽棴寮规
+};
</script>
<style lang="less" scoped>
.msi-content {
@@ -409,12 +432,12 @@
}
.cell {
- border: 1px solid gray; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
+ border: 1px solid #c1c1c1; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
height: 50px; /* 姣忎釜鏍煎瓙鐨勯珮搴� */
display: inline-block;
justify-content: center;
align-items: center; /* 灞呬腑鏄剧ず鍐呭 */
- width: 25px;
+ width: 49px;
}
.rowMy0 {
@@ -447,7 +470,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/kittingList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
index 32c0c1d..e5251c3 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
@@ -272,9 +272,19 @@
<div class="msi-form">
<el-form :model="detailForm">
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="閮ㄤ欢鍚嶇О">
<el-input v-model="detailForm.detailName" clearable placeholder="璇疯緭鍏ラ儴浠跺悕绉�" />
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="鎵规鍙�">
+ <el-input v-model="detailForm.planNo" clearable="" placeholder="璇疯緭鍏ユ壒娆″彿" />
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="鍖呰鍙�">
+ <el-input v-model="detailForm.packageCode" clearable="" placeholder="璇疯緭鍏ュ寘瑁呭彿" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -290,42 +300,47 @@
<div class="msi-content">
<!-- <p style="margin-bottom: 10px">鐗╂枡鏄庣粏</p> -->
<el-table :data="drawerList" border striped :max-height="480">
- <el-table-column fixed="left" type="index" label="搴忓彿" width="55" align="center" />
- <!-- <el-table-column prop="poId" label="PO鍗旾D" show-overflow-tooltip="" /> -->
- <!-- <el-table-column prop="poNo" label="PO鍗曞彿" show-overflow-tooltip="" /> -->
-
- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" 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="搴撳瓨鐘舵��" show-overflow-tooltip="">
+ <el-table-column label="搴忓彿" align="center" width="60" type="index" />
+ <el-table-column prop="packageCode" label="鍖呰鍙�" min-width="120"show-overflow-tooltip="" />
+ <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" min-width="120" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="areaCode" label="鎵�鍦ㄥ尯鍩�" show-overflow-tooltip="">
<template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
+ <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index) }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" 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" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="upiStatus" label="鏉挎枡鐘舵��" show-overflow-tooltip="">
<template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
+ <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index) }}</el-tag>
+ </template>
+ </el-table-column> -->
+ <el-table-column prop="isQiBao" label="鏄惁榻愬寘" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isQiBao"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </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" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="remarks" label="澶囨敞" show-overflow-tooltip="" />
+ <el-table-column prop="info1" label="绾哥闀�" show-overflow-tooltip="" />
+ <el-table-column prop="info2" label="绾哥瀹�" show-overflow-tooltip="" />
+ <el-table-column prop="info3" label="绾哥楂�" show-overflow-tooltip="" />
+ <el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="info6" label="绗嚑鍖�" show-overflow-tooltip="" />
+ <el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
+ <el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
+ <el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
+ <el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index) }}</el-tag>
+ </template>
+ </el-table-column> -->
</el-table>
<Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
@@ -334,29 +349,8 @@
</div>
</el-drawer>
- <el-dialog v-model="outVisible2" title="SPA鑾峰彇" width="20%" @close="closeOutDialog2">
- <el-form :model="outerForm2" label-width="120px">
- <el-row style="font-size: 16px">
- <el-col :span="23">
- <el-form-item label="鍗曞彿:" required>
- <el-input v-model="outerForm2.purchaseNo" clearable placeholder="璇疯緭鍏ュ崟鍙�" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
-
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="outVisible2 = false">鍙栨秷</el-button>
- <el-button type="primary" @click="getSapOrderPO">纭</el-button>
- </span>
- </template>
- </el-dialog>
-
<!-- 鎵撳嵃 -->
<print-table-ckd ref="printTableRef"></print-table-ckd>
-
- <printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
</div>
</template>
<script lang="ts" setup>
@@ -386,6 +380,7 @@
import { hiprint } from 'vue-plugin-hiprint';
import { SysPrintApi } from '/@/api-services/api';
import { SysPrint } from '/@/api-services/models';
+import { pageMes_Package_Gather } from '/@/api/main/WmsOrder/mes_Package_Gather';
const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
@@ -627,17 +622,14 @@
const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
detailForm.value.PageSize = 10; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
- if (scope.orderId) {
- title.value = `${scope.orderId}`;
+ if (scope.info5) {
+ title.value = `${scope.info5}`;
}
drawerType.value = 'drawerAll';
drawerVisible.value = true;
- //褰撳墠鍏ュ簱鍗曞彿id
- detailForm.value.orderId = scope.orderId;
- //鍏ュ簱鍗�
- purchaseNo.value = scope.orderId;
+ purchaseNo.value = scope.info5;
debugger;
- detailForm.value.orderId = scope.orderId;
+ detailForm.value.info5 = scope.info5;
//鑾峰彇鐗╂枡鍒楄〃
if (detailForm.value.poId == '') {
drawerList.value = [];
@@ -694,8 +686,7 @@
//鑾峰彇鍏ュ簱鍗曚笅鐗╂枡璇︽儏
const getDetail = async (callback?: any) => {
loading.value = true;
-
- var res = await pageWmsOrderPurchaseDetails(Object.assign(detailForm.value));
+ var res = await pageMes_Package_Gather(Object.assign(detailForm.value));
if (callback == 1) {
//缂栬緫鍏ュ彛
warehousOrderDetails.value = res.data.result?.items ?? [];
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
index d173fd4..6c4ed12 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -143,7 +143,7 @@
<!-- 鍙充晶琛ㄦ牸 -->
<div class="right-table">
- <p class="text-xtiny">缂哄鍒楄〃</p>
+ <!-- <p class="text-xtiny">缂哄鍒楄〃</p> -->
<el-table
:data="newTableData"
style="width: 100%"
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
index bd0662c..bff488e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -56,15 +56,6 @@
</div>
</div>
<ul>
- <li>
- <span class="text_left">閮ㄤ欢鏉＄爜:</span>
- <span class="text_rt">{{ tableData.upi }}</span>
- </li>
-
- <li>
- <span class="text_left">閮ㄤ欢鍚嶇О:</span>
- <span class="text_rt">{{ tableData.detailName }}</span>
- </li>
<li>
<span class="text_left">鎵规鍙�:</span>
@@ -94,10 +85,6 @@
<li>
<span class="text_left">绗嚑鍖�:</span>
<span class="text_rt">{{ tableData.info6 }}</span>
- </li>
- <li>
- <span class="text_left">缁忛攢搴楀悕绉�:</span>
- <span class="text_rt">{{ tableData.info7 }}</span>
</li>
<li>
<span class="text_left">浜у搧鍚嶇О:</span>
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/WmsOrder/shortageList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
index e4169bc..4fe65c0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -730,8 +730,6 @@
let itemSubTitle = ref<any[]>([]);
const handleHtmlPrint = () => {
proxy.$refs['printTableRef'].printHd('缂轰欢娓呭崟', {}, drawerList.value); //deltailList
-
- // proxy.$refs['printTableRef'].printHd('缂轰欢娓呭崟', itemSubTitle.value, drawerList.value); //deltailList
};
// 鏆撮湶鏂规硶
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/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs
new file mode 100644
index 0000000..8ef7bca
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs
@@ -0,0 +1,23 @@
+锘縰sing Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application;
+
+
+public class UnlineForNGPackageInput
+{
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public virtual string PackageCode { get; set; }
+
+
+ /// <summary>
+ /// NG鍘熷洜
+ /// </summary>
+ public virtual string Reason { get; set; }
+
+}
+
+
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 9554f49..0de0c10 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -199,6 +199,51 @@
}
+ /// <summary>
+ /// NG鍖呬笅绾�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "UnlineForNGPackage")]
+ [Description("WmsOperationTask/UnlineForNGPackage")]
+ public async Task UnlineForNGPackage(UnlineForNGPackageInput input)
+ {
+ //if (input == null)
+ //{
+ // throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ //}
+ //if (string.IsNullOrEmpty(input.PackageCode))
+ //{
+ // throw Oops.Oh("鍖呭彿涓嶈兘涓虹┖");
+ //}
+ //if (string.IsNullOrEmpty(input.Reason))
+ //{
+ // throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
+ //}
+ //List<WmsStockQuan> updateQuanList = new List<WmsStockQuan>();
+ //foreach (var item in input.PackageCodeList)
+ //{
+ // var quanList = await _wmsStockQuanRep.AsQueryable().Where(x => x.PackageCode == item).ToListAsync();
+ // var isExist = quanList.Where(x => x.StockStatus == StockStatusEnum.榻愬寘寰呭嚭搴�).Count();
+ // if (isExist > 0)
+ // {
+ // throw Oops.Oh($"鍖厈item}涓叾涓湁鏉跨姸鎬佹槸'{StockStatusEnum.榻愬寘寰呭嚭搴�.ToString()}'锛屼笉鍏佽寮哄埗鍑哄簱");
+ // }
+
+ // 鏇存柊鐘舵��
+ // foreach (var quan in quanList)
+ // {
+ // quan.StockStatus = StockStatusEnum.浜哄伐寮哄埗寰呭嚭搴�;
+ // quan.UpdateTime = DateTime.Now;
+ // quan.OperReason = "浜哄伐寮哄埗寰呭嚭搴�";
+ // }
+ // updateQuanList.AddRange(quanList);
+ //}
+
+ //await _wmsStockQuanRep.UpdateRangeAsync(updateQuanList);
+
+ }
}
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..1267a97 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>
@@ -263,6 +261,11 @@
</li>`;
});
$('#idList3').append(listItems1);
+ $('.dowebok2').liMarquee({
+ direction: 'up',
+ scrollamount: 20,
+ runshort: false
+ });
}
});
@@ -299,19 +302,15 @@
}
});
- // $(function () {
- // $('.dowebok1').liMarquee({
- // direction: 'up',
- // scrollamount:20,
- // runshort: false
- // });
+ $(function () {
+ // $('.dowebok1').liMarquee({
+ // direction: 'up',
+ // scrollamount:20,
+ // runshort: false
+ // });
- // $('.dowebok2').liMarquee({
- // direction: 'up',
- // scrollamount:20,
- // runshort: false
- // });
- // });
+
+ });
}
--
Gitblit v1.9.3