From 1db9d26e11f61f11b1b433ae0f564cb0faf18899 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 27 11月 2024 15:49:24 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs | 85 ++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs | 13
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs | 10
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 199 ++++++++++
LA24030_LuLiPackageLine_Web/public/config.js | 4
LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts | 78 ++++
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue | 280 ++++++++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs | 3
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue | 187 +++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs | 6
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs | 198 ++++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs | 60 +++
12 files changed, 1,113 insertions(+), 10 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/public/config.js b/LA24030_LuLiPackageLine_Web/public/config.js
index 72c8bc8..e888e9b 100644
--- a/LA24030_LuLiPackageLine_Web/public/config.js
+++ b/LA24030_LuLiPackageLine_Web/public/config.js
@@ -4,6 +4,6 @@
"VITE_OPEN_CDN": "false",
"VITE_PUBLIC_PATH": "",
"VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
- //"VITE_API_URL": "http://localhost:5005"
- "VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
+ "VITE_API_URL": "http://localhost:5005"
+ //"VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts b/LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts
new file mode 100644
index 0000000..d950f81
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/ThirdInterFace/mesPushPackageCode.ts
@@ -0,0 +1,78 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+ AddMesPushPackageCode = '/api/mesPushPackageCode/add',
+ DeleteMesPushPackageCode = '/api/mesPushPackageCode/delete',
+ UpdateMesPushPackageCode = '/api/mesPushPackageCode/update',
+ PageMesPushPackageCode = '/api/mesPushPackageCode/page',
+ ListMesPushPackageCode = '/api/mesPushPackageCode/list',
+ DetailMesPushPackageCode = '/api/mesPushPackageCode/detail',
+ ImportExcelMesPushPackageCode = '/api/mesPushPackageCode/importExcel',
+ DownloadExcelTemplateMesPushPackageCode = '/api/mesPushPackageCode/downloadExcelTemplate',
+}
+
+// 澧炲姞鍖呰瀹屾垚瀵规帴
+export const addMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.AddMesPushPackageCode,
+ method: 'post',
+ data: params
+ });
+
+// 鍒犻櫎鍖呰瀹屾垚瀵规帴
+export const deleteMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.DeleteMesPushPackageCode,
+ method: 'post',
+ data: params
+ });
+
+// 缂栬緫鍖呰瀹屾垚瀵规帴
+export const updateMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.UpdateMesPushPackageCode,
+ method: 'post',
+ data: params
+ });
+
+// 瀵煎叆鍖呰瀹屾垚瀵规帴
+export const importExcelMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.ImportExcelMesPushPackageCode,
+ method: 'post',
+ data: params
+ });
+
+// 涓嬭浇瀵煎叆鍖呰瀹屾垚瀵规帴妯℃澘
+export const downloadExcelTemplateMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.DownloadExcelTemplateMesPushPackageCode,
+ method: 'get',
+ data: params,
+ responseType: 'blob'
+ });
+
+
+// 鍒嗛〉鏌ヨ鍖呰瀹屾垚瀵规帴
+export const pageMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.PageMesPushPackageCode,
+ method: 'post',
+ data: params
+ });
+
+// 涓嶅垎椤垫煡璇㈠寘瑁呭畬鎴愬鎺�
+export const listMesPushPackageCode = (params?: any) =>
+ request({
+ url: Api.ListMesPushPackageCode,
+ method: 'get',
+ data: params
+ });
+
+// 璇︽儏鍖呰瀹屾垚瀵规帴
+export const detailMesPushPackageCode = (id: any) =>
+ request({
+ url: Api.DetailMesPushPackageCode,
+ method: 'get',
+ data: { id }
+ });
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
new file mode 100644
index 0000000..e7088ce
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
@@ -0,0 +1,187 @@
+锘�<template>
+ <div class="mesPushPackageCode-container">
+ <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+ <template #header>
+ <div style="color: #fff">
+ <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+ <span>{{ props.title }}</span>
+ </div>
+ </template>
+ <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
+ <el-row :gutter="35">
+ <el-form-item v-show="false">
+ <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="packageCode">
+ <el-input v-model="ruleForm.packageCode" placeholder="璇疯緭鍏ュ寘瑁呭彿" maxlength="50" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎺ㄩ�佺姸鎬�" prop="pushStatus">
+ <el-select clearable v-model="ruleForm.pushStatus" placeholder="璇烽�夋嫨鎺ㄩ�佺姸鎬�">
+ <el-option v-for="(item,index) in getEnumPushStatusData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+
+ </el-select>
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎺ㄩ�佹椂闂�" prop="pushTime">
+ <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="鎺ㄩ�佹椂闂�" />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎺ㄩ�佹鏁�" prop="pushNum">
+ <el-input-number v-model="ruleForm.pushNum" placeholder="璇疯緭鍏ユ帹閫佹鏁�" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎺ュ彛杩斿洖鍙傛暟" prop="apiMessage">
+ <el-input v-model="ruleForm.apiMessage" placeholder="璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁�" maxlength="50" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鍒涘缓鑰呴儴闂ㄥ悕绉�" prop="createOrgName">
+ <el-input v-model="ruleForm.createOrgName" placeholder="璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉�" maxlength="64" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submit" :disabled="disabled_btn">纭� 瀹�</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+<style scoped>
+:deep(.el-select),
+:deep(.el-input-number) {
+ width: 100%;
+}
+</style>
+<script lang="ts" setup>
+ import { ref,onMounted } from "vue";
+ import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+ import { ElMessage } from "element-plus";
+ import type { FormRules } from "element-plus";
+ import { addMesPushPackageCode, updateMesPushPackageCode, detailMesPushPackageCode } from "/@/api/main/ThirdInterFace/mesPushPackageCode";
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+
+ const getEnumPushStatusData = ref<any>([]);
+ //鐖剁骇浼犻�掓潵鐨勫弬鏁�
+ var props = defineProps({
+ title: {
+ type: String,
+ default: "",
+ },
+ });
+ //鐖剁骇浼犻�掓潵鐨勫嚱鏁帮紝鐢ㄤ簬鍥炶皟
+ const emit = defineEmits(["reloadTable"]);
+ const ruleFormRef = ref();
+ const isShowDialog = ref(false);
+ const loading = ref(false);
+ const disabled_btn = ref(false);
+ const ruleForm = ref<any>({});
+ //鑷娣诲姞鍏朵粬瑙勫垯
+ const rules = ref<FormRules>({
+ packageCode: [{required: true, message: '璇疯緭鍏ュ寘瑁呭彿锛�', trigger: 'blur',},],
+ pushStatus: [{required: true, message: '璇烽�夋嫨鎺ㄩ�佺姸鎬侊紒', trigger: 'change',},],
+ pushNum: [{required: true, message: '璇疯緭鍏ユ帹閫佹鏁帮紒', trigger: 'blur',},],
+ apiMessage: [{required: true, message: '璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁帮紒', trigger: 'blur',},],
+ createOrgName: [{required: true, message: '璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉帮紒', trigger: 'blur',},],
+ isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
+ });
+
+ /*
+ * 鎵撳紑寮圭獥
+ * @param flag 鏍囪锛�1鏂板 2缂栬緫 3鏌ョ湅锛�
+ * @param row 琛屾暟鎹�
+ */
+ const openDialog = async (flag: number,row: any) => {
+ // ruleForm.value = JSON.parse(JSON.stringify(row));
+ // 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
+ let rowData = JSON.parse(JSON.stringify(row));
+ if (rowData.id)
+ ruleForm.value = (await detailMesPushPackageCode(rowData.id)).data.result;
+ else {
+ ruleForm.value = rowData;
+ }
+ isShowDialog.value = true;
+ };
+
+ // 鍏抽棴寮圭獥
+ const closeDialog = () => {
+ emit("reloadTable");
+ isShowDialog.value = false;
+ };
+
+ // 鍙栨秷
+ const cancel = () => {
+ isShowDialog.value = false;
+ };
+
+ // 鎻愪氦
+ const submit = async () => {
+ disabled_btn.value = true;
+ ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+ if (isValid) {
+ loading.value = true;
+ let values = ruleForm.value;
+ let ret={};
+ let title='鏂板';
+ if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
+ ret = await addMesPushPackageCode(values);
+ } else {
+ title='缂栬緫';
+ ret = await updateMesPushPackageCode(values);
+ }
+ loading.value = false;
+ disabled_btn.value = false;
+ if(ret.data.type=="success"){
+ ElMessage.success(title+'鎴愬姛');
+ closeDialog();
+ }
+ } else {
+ disabled_btn.value = false;
+ ElMessage({
+ message: `琛ㄥ崟鏈�${Object.keys(fields).length}澶勯獙璇佸け璐ワ紝璇蜂慨鏀瑰悗鍐嶆彁浜,
+ type: "error",
+ });
+ }
+ });
+ };
+
+
+
+
+
+
+
+ // 椤甸潰鍔犺浇鏃�
+ onMounted(async () => {
+ getEnumPushStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
+ });
+
+ //灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+ defineExpose({ openDialog });
+</script>
+
+
+
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
new file mode 100644
index 0000000..251be5a
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
@@ -0,0 +1,280 @@
+锘�<template>
+ <div class="mesPushPackageCode-container">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <el-form :model="queryParamsMesPushPackageCode" ref="queryForm" labelWidth="90">
+ <el-row>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+ <el-form-item label="鍏抽敭瀛�">
+ <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="鍖呰鍙�,鎺ュ彛杩斿洖鍙傛暟,鍒涘缓鑰呴儴闂ㄥ悕绉�,鍒涘缓浜�,淇敼浜�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鍖呰鍙�">
+ <el-input v-model="queryParamsMesPushPackageCode.packageCode" clearable="" placeholder="璇疯緭鍏ュ寘瑁呭彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鎺ㄩ�佺姸鎬�">
+ <el-select clearable="" v-model="queryParamsMesPushPackageCode.pushStatus" placeholder="璇烽�夋嫨鎺ㄩ�佺姸鎬�">
+ <el-option v-for="(item,index) in getEnumPushStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
+
+ </el-select>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鎺ㄩ�佹椂闂�">
+ <el-date-picker placeholder="璇烽�夋嫨鎺ㄩ�佹椂闂�" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鎺ㄩ�佹鏁�">
+ <el-input-number v-model="queryParamsMesPushPackageCode.pushNum" clearable="" placeholder="璇疯緭鍏ユ帹閫佹鏁�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鎺ュ彛杩斿洖鍙傛暟">
+ <el-input v-model="queryParamsMesPushPackageCode.apiMessage" clearable="" placeholder="璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="鍒涘缓鑰呴儴闂ㄥ悕绉�">
+ <el-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
+ <el-form-item>
+ <el-button-group style="display: flex; align-items: center;">
+ <el-button type="primary" icon="ele-Search" @click="handleQueryMesPushPackageCode" v-auth="'mesPushPackageCode:page'" :disabled="disabled_btnMesPushPackageCode"> 鏌ヨ </el-button>
+ <el-button icon="ele-Refresh" @click="resetMesPushPackageCode"> 閲嶇疆 </el-button>
+ <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="!showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+ <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMesPushPackageCode" v-if="showAdvanceQueryUIMesPushPackageCode" style="margin-left:5px;"> 闅愯棌 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMesPushPackageCode" v-auth="'mesPushPackageCode:add'"> 鏂板 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMesPushPackageCode" v-auth="'mesPushPackageCode:exportExcel'" > 瀵煎嚭 </el-button>
+ </el-button-group>
+ </el-form-item>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
+ <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+ <el-table
+ ref="tableRefMesPushPackageCode"
+ :data="tableDataMesPushPackageCode"
+ style="width: 100%"
+ v-loading="loadingMesPushPackageCode"
+ tooltip-effect="light"
+ row-key="id"
+ @sort-change="sortChangeMesPushPackageCode"
+ border="">
+ <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+ <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="pushStatus" label="鎺ㄩ�佺姸鎬�" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="pushTime" label="鎺ㄩ�佹椂闂�" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="pushNum" label="鎺ㄩ�佹鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="apiMessage" label="鎺ュ彛杩斿洖鍙傛暟" show-overflow-tooltip="" />
+ <el-table-column prop="createOrgName" 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 label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPackageCode:update') || auth('mesPushPackageCode:delete')">
+ <template #default="scope">
+ <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:update'"> 缂栬緫 </el-button>
+ <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:delete'"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ v-model:currentPage="tableParamsMesPushPackageCode.page"
+ v-model:page-size="tableParamsMesPushPackageCode.pageSize"
+ :total="tableParamsMesPushPackageCode.total"
+ :page-sizes="[10, 20, 50, 100, 200, 500]"
+ small=""
+ background=""
+ @size-change="handleSizeChangeMesPushPackageCode"
+ @current-change="handleCurrentChangeMesPushPackageCode"
+ layout="total, sizes, prev, pager, next, jumper"
+ />
+ <printDialogMesPushPackageCode
+ ref="printDialogRefMesPushPackageCode"
+ :title="printMesPushPackageCodeTitle"
+ @reloadTable="handleQueryMesPushPackageCode" />
+ <editDialogMesPushPackageCode
+ ref="editDialogRefMesPushPackageCode"
+ :title="editMesPushPackageCodeTitle"
+ @reloadTable="handleQueryMesPushPackageCode"
+ />
+ </el-card>
+ </div>
+</template>
+
+<script lang="ts" setup="" name="mesPushPackageCode">
+ import { ref,onMounted } from "vue";
+ import { ElMessageBox, ElMessage } from "element-plus";
+ import { auth } from '/@/utils/authFunction';
+ import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+ import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
+ import { exportPageExcel } from '/@/utils/exportPageExcel' //寮曞叆瀵煎嚭鏂规硶
+
+
+ import printDialogMesPushPackageCode from '/@/views/system/print/component/hiprint/preview.vue'
+ import editDialogMesPushPackageCode from '/@/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue'
+ import { pageMesPushPackageCode, deleteMesPushPackageCode,importExcelMesPushPackageCode,downloadExcelTemplateMesPushPackageCode } from '/@/api/main/ThirdInterFace/mesPushPackageCode';
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+ import commonFunction from '/@/utils/commonFunction';
+
+ const getEnumPushStatusData_Index = ref<any>([]);
+
+ const { getEnumDesc } = commonFunction();
+
+ /***************************************************[鍖呰瀹屾垚瀵规帴鎿嶄綔]寮�濮�***************************************************/
+ const showAdvanceQueryUIMesPushPackageCode = ref(false);
+ const tableRefMesPushPackageCode = ref(null);
+ const printDialogRefMesPushPackageCode = ref();
+ const editDialogRefMesPushPackageCode = ref();
+ const loadingMesPushPackageCode = ref(false);
+ const disabled_btnMesPushPackageCode = ref(false);
+ const tableDataMesPushPackageCode = ref<any>([]);
+ const queryParamsMesPushPackageCode = ref<any>({});
+ const tableParamsMesPushPackageCode = ref({
+ page: 1,
+ pageSize: 10,
+ total: 0,
+ });
+
+ const printMesPushPackageCodeTitle = ref("");
+ const editMesPushPackageCodeTitle = ref("");
+
+ // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
+ const changeAdvanceQueryUIMesPushPackageCode = () => {
+ showAdvanceQueryUIMesPushPackageCode.value = !showAdvanceQueryUIMesPushPackageCode.value;
+ }
+
+ // 鏌ヨ鍖呰瀹屾垚瀵规帴
+ const handleQueryMesPushPackageCode = async () => {
+ loadingMesPushPackageCode.value = true;
+ disabled_btnMesPushPackageCode.value = true;
+ var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, tableParamsMesPushPackageCode.value));
+ if(res.data.type=="success"){
+ tableDataMesPushPackageCode.value = res.data.result?.items ?? [];
+ tableParamsMesPushPackageCode.value.total = res.data.result?.total;
+ }
+ loadingMesPushPackageCode.value = false;
+ disabled_btnMesPushPackageCode.value = false;
+ };
+
+ // 閲嶇疆鍖呰瀹屾垚瀵规帴鏌ヨ
+ const resetMesPushPackageCode = async () => {
+ queryParamsMesPushPackageCode.value = {}
+ };
+
+ // 鍖呰瀹屾垚瀵规帴鍒楁帓搴�
+ const sortChangeMesPushPackageCode = async (column: any) => {
+ queryParamsMesPushPackageCode.value.field = column.prop;
+ queryParamsMesPushPackageCode.value.order = column.order;
+ await handleQueryMesPushPackageCode();
+ };
+
+ // 鎵撳紑鏂板鍖呰瀹屾垚瀵规帴椤甸潰
+ const openAddMesPushPackageCode = () => {
+ editMesPushPackageCodeTitle.value = '娣诲姞鍖呰瀹屾垚瀵规帴';
+ editDialogRefMesPushPackageCode.value.openDialog(1,{});
+ };
+
+ // 鎵撳紑鎵撳嵃鍖呰瀹屾垚瀵规帴椤甸潰
+ const openPrintMesPushPackageCode = async (row: any) => {
+ printMesPushPackageCodeTitle.value = '鎵撳嵃鍖呰瀹屾垚瀵规帴';
+ }
+
+ // 鎵撳紑缂栬緫鍖呰瀹屾垚瀵规帴椤甸潰
+ const openEditMesPushPackageCode = (row: any) => {
+ editMesPushPackageCodeTitle.value = '缂栬緫鍖呰瀹屾垚瀵规帴';
+ editDialogRefMesPushPackageCode.value.openDialog(2,row);
+ };
+
+ // 鍒犻櫎鍖呰瀹屾垚瀵规帴
+ const delMesPushPackageCode = (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ loadingMesPushPackageCode.value = true;
+ var ret = await deleteMesPushPackageCode(row);
+ if(ret.data.type=="success"){
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ }
+ loadingMesPushPackageCode.value = false;
+ handleQueryMesPushPackageCode();
+ })
+ .catch(() => {});
+ };
+
+ // 鏀瑰彉鍖呰瀹屾垚瀵规帴椤甸潰瀹归噺
+ const handleSizeChangeMesPushPackageCode = (val: number) => {
+ tableParamsMesPushPackageCode.value.pageSize = val;
+ handleQueryMesPushPackageCode();
+ };
+
+ // 鏀瑰彉鍖呰瀹屾垚瀵规帴椤电爜搴忓彿
+ const handleCurrentChangeMesPushPackageCode = (val: number) => {
+ tableParamsMesPushPackageCode.value.page = val;
+ handleQueryMesPushPackageCode();
+ };
+
+/***************************************************[鍖呰瀹屾垚瀵规帴鎿嶄綔]缁撴潫***************************************************/
+/***************************************************[鍖呰瀹屾垚瀵规帴瀵煎嚭]寮�濮�***************************************************/
+//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
+const functionMapMesPushPackageCode = {
+ getEnumPushStatusData_Index,
+ formatDate_T_Date,
+ formatDate_T_Time
+};
+//鐐瑰嚮瀵煎嚭鎸夐挳
+const handleExportExcelMesPushPackageCode = async (formData:Blob) => {
+ loadingMesPushPackageCode.value = true;
+ disabled_btnMesPushPackageCode.value = true;
+ var new_tableParamsMesPushPackageCode=JSON.parse(JSON.stringify(tableParamsMesPushPackageCode.value));
+ new_tableParamsMesPushPackageCode.page = 1;
+ new_tableParamsMesPushPackageCode.pageSize = 100000;
+ var res = await pageMesPushPackageCode(Object.assign(queryParamsMesPushPackageCode.value, new_tableParamsMesPushPackageCode));
+ if(res.data.type=="success"){
+ exportExcelMesPushPackageCode(res.data.result?.items ?? []);
+ }
+ loadingMesPushPackageCode.value = false;
+ disabled_btnMesPushPackageCode.value = false;
+};
+//瀵煎嚭
+const exportExcelMesPushPackageCode = async (exportDataList:Array) => {
+ exportPageExcel(exportDataList, tableRefMesPushPackageCode,"鍖呰瀹屾垚瀵规帴",functionMapMesPushPackageCode);
+};
+/***************************************************[鍖呰瀹屾垚瀵规帴瀵煎嚭]缁撴潫***************************************************/
+ // 鍖呰瀹屾垚瀵规帴椤甸潰鍔犺浇鏃�
+ onMounted(async () => {
+ getEnumPushStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('PushStatusEnum')).data.result ?? [];
+ });
+
+ handleQueryMesPushPackageCode();
+</script>
+<style scoped>
+:deep(.el-input),
+:deep(.el-select),
+:deep(.el-input-number) {
+ width: 100%;
+}
+</style>
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
index d1050ba..b100c22 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
@@ -1,10 +1,12 @@
锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Enum;
+
namespace Admin.NET.Application.Entity;
/// <summary>
/// 鎺ㄩ�乵es鍖呰鍙疯〃
/// </summary>
-[SugarTable("mes_PushPackageCode", "鎺ㄩ�乵es鍖呰鍙疯〃")]
+[SugarTable("mes_push_packagecode", "鎺ㄩ�乵es鍖呰鍙疯〃")]
public class MesPushPackageCode : EntityBase
{
/// <summary>
@@ -19,7 +21,14 @@
/// </summary>
[Required]
[SugarColumn(ColumnName = "PushStatus", ColumnDescription = "鎺ㄩ�佺姸鎬�")]
- public int PushStatus { get; set; }
+ public PushStatusEnum PushStatus { get; set; }
+
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PushTime", ColumnDescription = "鎺ㄩ�佹椂闂�")]
+ public DateTime? PushTime { get; set; }
/// <summary>
/// 鎺ㄩ�佹鏁�
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
new file mode 100644
index 0000000..4d2013b
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
@@ -0,0 +1,60 @@
+锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Enum;
+
+namespace Admin.NET.Application.Entity;
+
+/// <summary>
+/// 鎺ㄩ�乵es瑁佺焊鏈烘帴鍙�
+/// </summary>
+[SugarTable("mes_push_papercut", "鎺ㄩ�乵es瑁佺焊鏈烘帴鍙�")]
+public class MesPushPaperCut : EntityBase
+{
+ #region 鎺ㄩ�佸弬鏁�
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+ [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
+ public float? Info1 { get; set; }
+
+ [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
+ public float? Info2 { get; set; }
+
+ [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
+ public float? Info3 { get; set; }
+
+ #endregion
+
+
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PushStatus", ColumnDescription = "鎺ㄩ�佺姸鎬�")]
+ public PushStatusEnum PushStatus { get; set; }
+
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PushTime", ColumnDescription = "鎺ㄩ�佹椂闂�")]
+ public DateTime? PushTime { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹鏁�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PushNum", ColumnDescription = "鎺ㄩ�佹鏁�")]
+ public int PushNum { get; set; }
+
+ /// <summary>
+ /// 鎺ュ彛杩斿洖鍙傛暟
+ /// </summary>
+ [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "鎺ュ彛杩斿洖鍙傛暟", Length = 50)]
+ public string ApiMessage { get; set; }
+
+}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs
index 8a3079c..88ee647 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PushStatusEnum.cs
@@ -5,6 +5,12 @@
using System.Threading.Tasks;
namespace Admin.NET.Core.Enum;
+
+
+/// <summary>
+/// 鎺ㄩ�佺姸鎬�
+/// </summary>
+[Description("鎺ㄩ�佺姸鎬�")]
public enum PushStatusEnum
{
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
new file mode 100644
index 0000000..82e4e02
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
@@ -0,0 +1,198 @@
+锘縰sing Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application;
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴鍩虹杈撳叆鍙傛暟
+ /// </summary>
+ public class MesPushPackageCodeBaseInput
+ {
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public virtual string PackageCode { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ public virtual Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ public virtual DateTime? PushTime { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹鏁�
+ /// </summary>
+ public virtual int PushNum { get; set; }
+
+ /// <summary>
+ /// 鎺ュ彛杩斿洖鍙傛暟
+ /// </summary>
+ public virtual string ApiMessage { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂↖d
+ /// </summary>
+ public virtual long? CreateOrgId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ public virtual string CreateOrgName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public virtual DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒d
+ /// </summary>
+ public virtual long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒d
+ /// </summary>
+ public virtual long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public virtual bool IsDelete { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+ /// </summary>
+ public class MesPushPackageCodeInput : BasePageInput
+ {
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public string? PackageCode { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ public Admin.NET.Core.Enum.PushStatusEnum? PushStatus { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ public DateTime? PushTime { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂磋寖鍥�
+ /// </summary>
+ public List<DateTime?> PushTimeRange { get; set; }
+ /// <summary>
+ /// 鎺ㄩ�佹鏁�
+ /// </summary>
+ public int? PushNum { get; set; }
+
+ /// <summary>
+ /// 鎺ュ彛杩斿洖鍙傛暟
+ /// </summary>
+ public string? ApiMessage { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ public string? CreateOrgName { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴澧炲姞杈撳叆鍙傛暟
+ /// </summary>
+ public class AddMesPushPackageCodeInput : MesPushPackageCodeBaseInput
+ {
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ [Required(ErrorMessage = "鍖呰鍙蜂笉鑳戒负绌�")]
+ public override string PackageCode { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ [Required(ErrorMessage = "鎺ㄩ�佺姸鎬佷笉鑳戒负绌�")]
+ public override Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹鏁�
+ /// </summary>
+ [Required(ErrorMessage = "鎺ㄩ�佹鏁颁笉鑳戒负绌�")]
+ public override int PushNum { get; set; }
+
+ /// <summary>
+ /// 鎺ュ彛杩斿洖鍙傛暟
+ /// </summary>
+ [Required(ErrorMessage = "鎺ュ彛杩斿洖鍙傛暟涓嶈兘涓虹┖")]
+ public override string ApiMessage { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ [Required(ErrorMessage = "鍒涘缓鑰呴儴闂ㄥ悕绉颁笉鑳戒负绌�")]
+ public override string CreateOrgName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
+ public override bool IsDelete { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴鍒犻櫎杈撳叆鍙傛暟
+ /// </summary>
+ public class DeleteMesPushPackageCodeInput : BaseIdInput
+ {
+ }
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴鏇存柊杈撳叆鍙傛暟
+ /// </summary>
+ public class UpdateMesPushPackageCodeInput : AddMesPushPackageCodeInput
+ {
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰瀹屾垚瀵规帴涓婚敭鏌ヨ杈撳叆鍙傛暟
+ /// </summary>
+ public class QueryByIdMesPushPackageCodeInput : DeleteMesPushPackageCodeInput
+ {
+
+ }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
new file mode 100644
index 0000000..aa5271c
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
@@ -0,0 +1,85 @@
+锘縩amespace Admin.NET.Application;
+
+/// <summary>
+/// 鍖呰瀹屾垚瀵规帴杈撳嚭鍙傛暟
+/// </summary>
+public class MesPushPackageCodeOutput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ public long? Id { get; set; }
+
+ /// <summary>
+ /// 鍖呰鍙�
+ /// </summary>
+ public string PackageCode { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ public Admin.NET.Core.Enum.PushStatusEnum PushStatus { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹椂闂�
+ /// </summary>
+ public DateTime? PushTime { get; set; }
+
+ /// <summary>
+ /// 鎺ㄩ�佹鏁�
+ /// </summary>
+ public int PushNum { get; set; }
+
+ /// <summary>
+ /// 鎺ュ彛杩斿洖鍙傛暟
+ /// </summary>
+ public string ApiMessage { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂↖d
+ /// </summary>
+ public long? CreateOrgId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ public string CreateOrgName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒d
+ /// </summary>
+ public long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒d
+ /// </summary>
+ public long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public bool IsDelete { get; set; }
+
+ }
+
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
new file mode 100644
index 0000000..39b1fba
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -0,0 +1,199 @@
+锘縰sing Admin.NET.Core.Service;
+using Admin.NET.Application.Entity;
+using Microsoft.AspNetCore.Http;
+using System.Data;
+using System.Web;
+using System.Text;
+namespace Admin.NET.Application;
+/// <summary>
+/// 鍖呰瀹屾垚瀵规帴鏈嶅姟
+/// </summary>
+[ApiDescriptionSettings(ApplicationConst.ThirdInterFaceGroupName, Order = 100)]
+public class MesPushPackageCodeService : IDynamicApiController, ITransient
+{
+ private readonly SqlSugarRepository<MesPushPackageCode> _rep;
+ public MesPushPackageCodeService(SqlSugarRepository<MesPushPackageCode> rep)
+ {
+ _rep = rep;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ鍖呰瀹屾垚瀵规帴
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Page")]
+ [Description("MesPushPackageCode/Page")]
+ public async Task<SqlSugarPagedList<MesPushPackageCodeOutput>> Page(MesPushPackageCodeInput input)
+ {
+ var query = CommonPageFilter(input);
+ return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
+ }
+
+ /// <summary>
+ /// 涓嶅垎椤垫煡璇㈠寘瑁呭畬鎴愬鎺�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "List")]
+ [Description("MesPushPackageCode/List")]
+ public async Task<List<MesPushPackageCodeOutput>> List([FromQuery] MesPushPackageCodeInput input)
+ {
+ var query = CommonPageFilter(input);
+ return await query.OrderBuilder(input, "", "Id").Select<MesPushPackageCodeOutput>().ToListAsync();
+ }
+
+ /// <summary>
+ /// 澧炲姞鍖呰瀹屾垚瀵规帴
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Add")]
+ [Description("MesPushPackageCode/Add")]
+ public async Task<long> Add(AddMesPushPackageCodeInput input)
+ {
+ var entity = input.Adapt<MesPushPackageCode>();
+
+ //閲嶅鎬ч獙璇�
+ await CheckExist(entity);
+
+ await _rep.InsertAsync(entity);
+ return entity.Id;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍖呰瀹屾垚瀵规帴
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Delete")]
+ [Description("MesPushPackageCode/Delete")]
+ public async Task Delete(DeleteMesPushPackageCodeInput input)
+ {
+ var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+ //await _rep.FakeDeleteAsync(entity); //鍋囧垹闄�
+ await _rep.DeleteAsync(entity); //鐪熷垹闄�
+ }
+
+ /// <summary>
+ /// 鏇存柊鍖呰瀹屾垚瀵规帴
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Update")]
+ [Description("MesPushPackageCode/Update")]
+ public async Task Update(UpdateMesPushPackageCodeInput input)
+ {
+ var entity = input.Adapt<MesPushPackageCode>();
+
+ //閲嶅鎬ч獙璇�
+ await CheckExist(entity,true);
+
+ await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍖呰瀹屾垚瀵规帴
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "Detail")]
+ [Description("MesPushPackageCode/Detail")]
+ public async Task<MesPushPackageCode> Detail([FromQuery] QueryByIdMesPushPackageCodeInput input)
+ {
+ return await _rep.GetFirstAsync(u => u.Id == input.Id);
+ }
+
+
+
+
+
+
+ #region 绉佹湁鏂规硶
+
+ /// <summary>
+ /// 鍏叡鏌ヨ鍖呰瀹屾垚瀵规帴鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private ISugarQueryable<MesPushPackageCodeOutput> CommonPageFilter(MesPushPackageCodeInput input)
+ {
+ var query = _rep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
+ u.PackageCode.Contains(input.SearchKey.Trim())
+ || u.ApiMessage.Contains(input.SearchKey.Trim())
+ || u.CreateOrgName.Contains(input.SearchKey.Trim())
+ || u.CreateUserName.Contains(input.SearchKey.Trim())
+ || u.UpdateUserName.Contains(input.SearchKey.Trim())
+ )
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
+ .WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
+ .WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
+ .Select<MesPushPackageCodeOutput>();
+ if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
+ {
+ DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.PushTime > start);
+ if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
+ {
+ var end = input.PushTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.PushTime < end);
+ }
+ }
+ return query;
+ }
+
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( MesPushPackageCode input,bool isEdit=false)
+ {
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<MesPushPackageCode> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+ }
+ #endregion
+
+}
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
index 54739b1..ef29454 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
@@ -1,4 +1,5 @@
锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Enum;
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application;
@@ -93,7 +94,7 @@
/// <summary>
/// 鎺ㄩ�佺姸鎬�
/// </summary>
- public int? PushStatus { get; set; }
+ public PushStatusEnum? PushStatus { get; set; }
/// <summary>
/// 鎺ㄩ�佹鏁�
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
index e4801fc..45aebbb 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -124,24 +124,24 @@
{
var value = await _rep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
if (value == null) throw Oops.Oh("鍖呰鍙蜂笉瀛樺湪");
- if (value.PushStatus != (int)PushStatusEnum.NotPush || value.PushStatus != (int)PushStatusEnum.Pushing) throw Oops.Oh("閲嶅鎺ㄩ��");
+ if (value.PushStatus != PushStatusEnum.NotPush || value.PushStatus != PushStatusEnum.Pushing) throw Oops.Oh("閲嶅鎺ㄩ��");
string url = "http://localhost:8088/api/getwmstask/getwmstask";
var respon = await url.SetHttpMethod(HttpMethod.Post).SetBody(input).PostAsStringAsync();
var data = respon.FromJson<Respone>();
if (data.iState == 1)
{
- value.PushStatus = (int)PushStatusEnum.PushSuccess;
+ value.PushStatus = PushStatusEnum.PushSuccess;
value.ApiMessage = data.message;
value.PushNum++;
}
else
{
- value.PushStatus = (int)PushStatusEnum.Pushing;
+ value.PushStatus = PushStatusEnum.Pushing;
value.ApiMessage = data.message;
value.PushNum++;
if (value.PushNum == 3)
{
- value.PushStatus = (int)PushStatusEnum.PushFail;
+ value.PushStatus = PushStatusEnum.PushFail;
}
}
await _rep.UpdateAsync(value);
@@ -231,7 +231,7 @@
}
else
{
- addItem.PushStatus = outPushStatus;
+
}
}
--
Gitblit v1.9.3