From 138497ecffb6dbf468c458ed9f7e72bc88d2e7a0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 10:56:13 +0800
Subject: [PATCH] 11
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsTask/WmsRbLineRunMode.cs | 14
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeOutput.cs | 90 +++++
LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsRbLineRunMode.ts | 78 ++++
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/index.vue | 266 ++++++++++++++
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 5
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs | 195 ++++++++++
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/component/editDialog.vue | 196 ++++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs | 179 +++++++++
8 files changed, 1,014 insertions(+), 9 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index 75b3e7d..48b1470 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -150,7 +150,7 @@
{
upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
}
-
+ /*
//鏌ヨ鏄惁榻愬寘
var allList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
var isQiTaoList = allList.Where(x => x.AreaCode == (int)AreaCodeEnum.寰呯紦瀛樺垎鎷ｅ尯
@@ -267,7 +267,7 @@
wmsDB.mes_upi_linequeue.Remove(lastUpiLineQueue);
}
}
-
+ //*/
//if (qitaoReault == false) {
// //涓存椂
// SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"妯℃嫙鍟婂晩锛屾殏鍋滃晩鍟�";
@@ -316,6 +316,7 @@
}
//鏇存柊 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢 鏁版嵁
var rbRunMode = wmsDB.wms_rbline_runmode.FirstOrDefault();
+ rbRunMode.UPI = upiObj.UPI;
rbRunMode.PlanNo = upiObj.PlanNo;
rbRunMode.OrderId = upiObj.OrderId;
rbRunMode.PackageCode = upiObj.PackageCode;
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsRbLineRunMode.ts b/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsRbLineRunMode.ts
new file mode 100644
index 0000000..17a2f02
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsRbLineRunMode.ts
@@ -0,0 +1,78 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+ AddWmsRbLineRunMode = '/api/wmsRbLineRunMode/add',
+ DeleteWmsRbLineRunMode = '/api/wmsRbLineRunMode/delete',
+ UpdateWmsRbLineRunMode = '/api/wmsRbLineRunMode/update',
+ PageWmsRbLineRunMode = '/api/wmsRbLineRunMode/page',
+ ListWmsRbLineRunMode = '/api/wmsRbLineRunMode/list',
+ DetailWmsRbLineRunMode = '/api/wmsRbLineRunMode/detail',
+ ImportExcelWmsRbLineRunMode = '/api/wmsRbLineRunMode/importExcel',
+ DownloadExcelTemplateWmsRbLineRunMode = '/api/wmsRbLineRunMode/downloadExcelTemplate',
+}
+
+// 澧炲姞鍖呰绾跨紦瀛樻暟鎹�
+export const addWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.AddWmsRbLineRunMode,
+ method: 'post',
+ data: params
+ });
+
+// 鍒犻櫎鍖呰绾跨紦瀛樻暟鎹�
+export const deleteWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.DeleteWmsRbLineRunMode,
+ method: 'post',
+ data: params
+ });
+
+// 缂栬緫鍖呰绾跨紦瀛樻暟鎹�
+export const updateWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.UpdateWmsRbLineRunMode,
+ method: 'post',
+ data: params
+ });
+
+// 瀵煎叆鍖呰绾跨紦瀛樻暟鎹�
+export const importExcelWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.ImportExcelWmsRbLineRunMode,
+ method: 'post',
+ data: params
+ });
+
+// 涓嬭浇瀵煎叆鍖呰绾跨紦瀛樻暟鎹ā鏉�
+export const downloadExcelTemplateWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.DownloadExcelTemplateWmsRbLineRunMode,
+ method: 'get',
+ data: params,
+ responseType: 'blob'
+ });
+
+
+// 鍒嗛〉鏌ヨ鍖呰绾跨紦瀛樻暟鎹�
+export const pageWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.PageWmsRbLineRunMode,
+ method: 'post',
+ data: params
+ });
+
+// 涓嶅垎椤垫煡璇㈠寘瑁呯嚎缂撳瓨鏁版嵁
+export const listWmsRbLineRunMode = (params?: any) =>
+ request({
+ url: Api.ListWmsRbLineRunMode,
+ method: 'get',
+ data: params
+ });
+
+// 璇︽儏鍖呰绾跨紦瀛樻暟鎹�
+export const detailWmsRbLineRunMode = (id: any) =>
+ request({
+ url: Api.DetailWmsRbLineRunMode,
+ method: 'get',
+ data: { id }
+ });
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/component/editDialog.vue
new file mode 100644
index 0000000..064d24c
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/component/editDialog.vue
@@ -0,0 +1,196 @@
+锘�<template>
+ <div class="wmsRbLineRunMode-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="BZ01澶勭悊鐨勬澘浠�" prop="uPI">
+ <el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏Z01澶勭悊鐨勬澘浠�" 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="BZ01澶勭悊鐨勬壒娆″彿" prop="planNo">
+ <el-input v-model="ruleForm.planNo" placeholder="璇疯緭鍏Z01澶勭悊鐨勬壒娆″彿" 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="BZ01澶勭悊鐨勮鍗曞彿" prop="orderId">
+ <el-input v-model="ruleForm.orderId" placeholder="璇疯緭鍏Z01澶勭悊鐨勮鍗曞彿" 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="BZ01澶勭悊鐨勫寘瑁呭彿" prop="packageCode">
+ <el-input v-model="ruleForm.packageCode" placeholder="璇疯緭鍏Z01澶勭悊鐨勫寘瑁呭彿" 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="lineRunMode">
+ <el-select clearable v-model="ruleForm.lineRunMode" placeholder="璇烽�夋嫨杩愯妯″紡">
+ <el-option v-for="(item,index) in getEnumLineRunModeData" :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="lineRunModeName">
+ <el-input v-model="ruleForm.lineRunModeName" 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="palletizingUPI">
+ <el-input v-model="ruleForm.palletizingUPI" 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="palletizingStation">
+ <el-input-number v-model="ruleForm.palletizingStation" placeholder="璇疯緭鍏ヤ笂涓�娆＄爜鍨涚珯鐐�" 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 { addWmsRbLineRunMode, updateWmsRbLineRunMode, detailWmsRbLineRunMode } from "/@/api/main/WmsOrder/wmsRbLineRunMode";
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+
+ const getEnumLineRunModeData = 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>({
+ 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 detailWmsRbLineRunMode(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 addWmsRbLineRunMode(values);
+ } else {
+ title='缂栬緫';
+ ret = await updateWmsRbLineRunMode(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 () => {
+ getEnumLineRunModeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('RbRunModeEnum')).data.result ?? [];
+ });
+
+ //灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+ defineExpose({ openDialog });
+</script>
+
+
+
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/index.vue
new file mode 100644
index 0000000..fffe77b
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsRbLineRunMode/index.vue
@@ -0,0 +1,266 @@
+锘�<template>
+ <div class="wmsRbLineRunMode-container">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <el-form :model="queryParamsWmsRbLineRunMode" 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="queryParamsWmsRbLineRunMode.searchKey" clearable="" placeholder="BZ01澶勭悊鐨勬澘浠�,BZ01澶勭悊鐨勬壒娆″彿,BZ01澶勭悊鐨勮鍗曞彿,BZ01澶勭悊鐨勫寘瑁呭彿,杩愯妯″紡鍚嶇О,鍒涘缓浜�,淇敼浜�,涓婁竴娆＄爜鍨涙澘浠�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="BZ01澶勭悊鐨勬澘浠�">
+ <el-input v-model="queryParamsWmsRbLineRunMode.uPI" clearable="" placeholder="璇疯緭鍏Z01澶勭悊鐨勬澘浠�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="BZ01澶勭悊鐨勬壒娆″彿">
+ <el-input v-model="queryParamsWmsRbLineRunMode.planNo" clearable="" placeholder="璇疯緭鍏Z01澶勭悊鐨勬壒娆″彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="BZ01澶勭悊鐨勮鍗曞彿">
+ <el-input v-model="queryParamsWmsRbLineRunMode.orderId" clearable="" placeholder="璇疯緭鍏Z01澶勭悊鐨勮鍗曞彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="BZ01澶勭悊鐨勫寘瑁呭彿">
+ <el-input v-model="queryParamsWmsRbLineRunMode.packageCode" clearable="" placeholder="璇疯緭鍏Z01澶勭悊鐨勫寘瑁呭彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="杩愯妯″紡">
+ <el-select clearable="" v-model="queryParamsWmsRbLineRunMode.lineRunMode" placeholder="璇烽�夋嫨杩愯妯″紡">
+ <el-option v-for="(item,index) in getEnumLineRunModeData_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="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="杩愯妯″紡鍚嶇О">
+ <el-input v-model="queryParamsWmsRbLineRunMode.lineRunModeName" clearable="" placeholder="璇疯緭鍏ヨ繍琛屾ā寮忓悕绉�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="涓婁竴娆＄爜鍨涙澘浠�">
+ <el-input v-model="queryParamsWmsRbLineRunMode.palletizingUPI" clearable="" placeholder="璇疯緭鍏ヤ笂涓�娆＄爜鍨涙澘浠�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineRunMode">
+ <el-form-item label="涓婁竴娆＄爜鍨涚珯鐐�">
+ <el-input-number v-model="queryParamsWmsRbLineRunMode.palletizingStation" 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="handleQueryWmsRbLineRunMode" v-auth="'wmsRbLineRunMode:page'" :disabled="disabled_btnWmsRbLineRunMode"> 鏌ヨ </el-button>
+ <el-button icon="ele-Refresh" @click="resetWmsRbLineRunMode"> 閲嶇疆 </el-button>
+ <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIWmsRbLineRunMode" v-if="!showAdvanceQueryUIWmsRbLineRunMode" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+ <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIWmsRbLineRunMode" v-if="showAdvanceQueryUIWmsRbLineRunMode" style="margin-left:5px;"> 闅愯棌 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsRbLineRunMode" v-auth="'wmsRbLineRunMode:add'"> 鏂板 </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="tableRefWmsRbLineRunMode"
+ :data="tableDataWmsRbLineRunMode"
+ style="width: 100%"
+ v-loading="loadingWmsRbLineRunMode"
+ tooltip-effect="light"
+ row-key="id"
+ @sort-change="sortChangeWmsRbLineRunMode"
+ border="">
+ <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+ <el-table-column prop="uPI" label="BZ01澶勭悊鐨勬澘浠�" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="BZ01澶勭悊鐨勬壒娆″彿" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="BZ01澶勭悊鐨勮鍗曞彿" show-overflow-tooltip="" />
+ <el-table-column prop="packageCode" label="BZ01澶勭悊鐨勫寘瑁呭彿" show-overflow-tooltip="" />
+ <el-table-column prop="lineRunMode" label="杩愯妯″紡" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.lineRunMode, getEnumLineRunModeData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="lineRunModeName" 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="palletizingUPI" label="涓婁竴娆＄爜鍨涙澘浠�" show-overflow-tooltip="" />
+ <el-table-column prop="palletizingStation" label="涓婁竴娆＄爜鍨涚珯鐐�" show-overflow-tooltip="" />
+ <el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('wmsRbLineRunMode:update') || auth('wmsRbLineRunMode:delete')">
+ <template #default="scope">
+ <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWmsRbLineRunMode(scope.row)" v-auth="'wmsRbLineRunMode:update'"> 缂栬緫 </el-button>
+ <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWmsRbLineRunMode(scope.row)" v-auth="'wmsRbLineRunMode:delete'"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ v-model:currentPage="tableParamsWmsRbLineRunMode.page"
+ v-model:page-size="tableParamsWmsRbLineRunMode.pageSize"
+ :total="tableParamsWmsRbLineRunMode.total"
+ :page-sizes="[10, 20, 50, 100, 200, 500]"
+ small=""
+ background=""
+ @size-change="handleSizeChangeWmsRbLineRunMode"
+ @current-change="handleCurrentChangeWmsRbLineRunMode"
+ layout="total, sizes, prev, pager, next, jumper"
+ />
+ <printDialogWmsRbLineRunMode
+ ref="printDialogRefWmsRbLineRunMode"
+ :title="printWmsRbLineRunModeTitle"
+ @reloadTable="handleQueryWmsRbLineRunMode" />
+ <editDialogWmsRbLineRunMode
+ ref="editDialogRefWmsRbLineRunMode"
+ :title="editWmsRbLineRunModeTitle"
+ @reloadTable="handleQueryWmsRbLineRunMode"
+ />
+ </el-card>
+ </div>
+</template>
+
+<script lang="ts" setup="" name="wmsRbLineRunMode">
+ 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 printDialogWmsRbLineRunMode from '/@/views/system/print/component/hiprint/preview.vue'
+ import editDialogWmsRbLineRunMode from '/@/views/main/WmsOrder/wmsRbLineRunMode/component/editDialog.vue'
+ import { pageWmsRbLineRunMode, deleteWmsRbLineRunMode,importExcelWmsRbLineRunMode,downloadExcelTemplateWmsRbLineRunMode } from '/@/api/main/WmsOrder/wmsRbLineRunMode';
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+ import commonFunction from '/@/utils/commonFunction';
+
+ const getEnumLineRunModeData_Index = ref<any>([]);
+
+ const { getEnumDesc } = commonFunction();
+
+ /***************************************************[鍖呰绾跨紦瀛樻暟鎹搷浣淽寮�濮�***************************************************/
+ const showAdvanceQueryUIWmsRbLineRunMode = ref(false);
+ const tableRefWmsRbLineRunMode = ref(null);
+ const printDialogRefWmsRbLineRunMode = ref();
+ const editDialogRefWmsRbLineRunMode = ref();
+ const loadingWmsRbLineRunMode = ref(false);
+ const disabled_btnWmsRbLineRunMode = ref(false);
+ const tableDataWmsRbLineRunMode = ref<any>([]);
+ const queryParamsWmsRbLineRunMode = ref<any>({});
+ const tableParamsWmsRbLineRunMode = ref({
+ page: 1,
+ pageSize: 10,
+ total: 0,
+ });
+
+ const printWmsRbLineRunModeTitle = ref("");
+ const editWmsRbLineRunModeTitle = ref("");
+
+ // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
+ const changeAdvanceQueryUIWmsRbLineRunMode = () => {
+ showAdvanceQueryUIWmsRbLineRunMode.value = !showAdvanceQueryUIWmsRbLineRunMode.value;
+ }
+
+ // 鏌ヨ鍖呰绾跨紦瀛樻暟鎹�
+ const handleQueryWmsRbLineRunMode = async () => {
+ loadingWmsRbLineRunMode.value = true;
+ disabled_btnWmsRbLineRunMode.value = true;
+ var res = await pageWmsRbLineRunMode(Object.assign(queryParamsWmsRbLineRunMode.value, tableParamsWmsRbLineRunMode.value));
+ if(res.data.type=="success"){
+ tableDataWmsRbLineRunMode.value = res.data.result?.items ?? [];
+ tableParamsWmsRbLineRunMode.value.total = res.data.result?.total;
+ }
+ loadingWmsRbLineRunMode.value = false;
+ disabled_btnWmsRbLineRunMode.value = false;
+ };
+
+ // 閲嶇疆鍖呰绾跨紦瀛樻暟鎹煡璇�
+ const resetWmsRbLineRunMode = async () => {
+ queryParamsWmsRbLineRunMode.value = {}
+ };
+
+ // 鍖呰绾跨紦瀛樻暟鎹垪鎺掑簭
+ const sortChangeWmsRbLineRunMode = async (column: any) => {
+ queryParamsWmsRbLineRunMode.value.field = column.prop;
+ queryParamsWmsRbLineRunMode.value.order = column.order;
+ await handleQueryWmsRbLineRunMode();
+ };
+
+ // 鎵撳紑鏂板鍖呰绾跨紦瀛樻暟鎹〉闈�
+ const openAddWmsRbLineRunMode = () => {
+ editWmsRbLineRunModeTitle.value = '娣诲姞鍖呰绾跨紦瀛樻暟鎹�';
+ editDialogRefWmsRbLineRunMode.value.openDialog(1,{});
+ };
+
+ // 鎵撳紑鎵撳嵃鍖呰绾跨紦瀛樻暟鎹〉闈�
+ const openPrintWmsRbLineRunMode = async (row: any) => {
+ printWmsRbLineRunModeTitle.value = '鎵撳嵃鍖呰绾跨紦瀛樻暟鎹�';
+ }
+
+ // 鎵撳紑缂栬緫鍖呰绾跨紦瀛樻暟鎹〉闈�
+ const openEditWmsRbLineRunMode = (row: any) => {
+ editWmsRbLineRunModeTitle.value = '缂栬緫鍖呰绾跨紦瀛樻暟鎹�';
+ editDialogRefWmsRbLineRunMode.value.openDialog(2,row);
+ };
+
+ // 鍒犻櫎鍖呰绾跨紦瀛樻暟鎹�
+ const delWmsRbLineRunMode = (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ loadingWmsRbLineRunMode.value = true;
+ var ret = await deleteWmsRbLineRunMode(row);
+ if(ret.data.type=="success"){
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ }
+ loadingWmsRbLineRunMode.value = false;
+ handleQueryWmsRbLineRunMode();
+ })
+ .catch(() => {});
+ };
+
+ // 鏀瑰彉鍖呰绾跨紦瀛樻暟鎹〉闈㈠閲�
+ const handleSizeChangeWmsRbLineRunMode = (val: number) => {
+ tableParamsWmsRbLineRunMode.value.pageSize = val;
+ handleQueryWmsRbLineRunMode();
+ };
+
+ // 鏀瑰彉鍖呰绾跨紦瀛樻暟鎹〉鐮佸簭鍙�
+ const handleCurrentChangeWmsRbLineRunMode = (val: number) => {
+ tableParamsWmsRbLineRunMode.value.page = val;
+ handleQueryWmsRbLineRunMode();
+ };
+
+/***************************************************[鍖呰绾跨紦瀛樻暟鎹搷浣淽缁撴潫***************************************************/
+ // 鍖呰绾跨紦瀛樻暟鎹〉闈㈠姞杞芥椂
+ onMounted(async () => {
+ getEnumLineRunModeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('RbRunModeEnum')).data.result ?? [];
+ });
+
+ handleQueryWmsRbLineRunMode();
+</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/WmsTask/WmsRbLineRunMode.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsTask/WmsRbLineRunMode.cs
index 6436079..730f849 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsTask/WmsRbLineRunMode.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsTask/WmsRbLineRunMode.cs
@@ -8,33 +8,33 @@
namespace Admin.NET.Application.Entity
{
/// <summary>
- /// 鏈哄櫒浜虹紦瀛樺矝杩愯妯″紡
+ /// 鍖呰绾跨紦瀛樻暟鎹�
/// </summary>
- [SugarTable("wms_rbline_runmode", "鏈哄櫒浜虹紦瀛樺矝杩愯妯″紡")]
+ [SugarTable("wms_rbline_runmode", "鍖呰绾跨紦瀛樻暟鎹�")]
public class WmsRbLineRunMode : EntityBase
{
/// <summary>
/// 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢
- [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉＄爜", Length = 50)]
+ [SugarColumn(ColumnName = "UPI", ColumnDescription = "BZ01澶勭悊鐨勬澘浠�", Length = 50)]
public string? UPI { get; set; }
/// <summary>
/// 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢
/// </summary>
- [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "BZ01澶勭悊鐨勬壒娆″彿", Length = 50)]
public string? PlanNo { get; set; }
/// <summary>
/// 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢
/// </summary>
- [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "BZ01澶勭悊鐨勮鍗曞彿", Length = 50)]
public string? OrderId { get; set; }
/// <summary>
/// 鏈�鍚庝竴娆″湪 BZ_01鐨勭郴缁熷鐞嗙殑鏉夸欢
/// </summary>
- [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "BZ01澶勭悊鐨勫寘瑁呭彿", Length = 50)]
public string? PackageCode { get; set; }
@@ -56,7 +56,7 @@
/// <summary>
/// 涓婁竴娆＄爜鍨涚紪鍙�
/// </summary>
- [SugarColumn(ColumnName = "PalletizingUPI", ColumnDescription = "涓婁竴娆＄爜鍨涚紪鍙�", Length = 50)]
+ [SugarColumn(ColumnName = "PalletizingUPI", ColumnDescription = "涓婁竴娆＄爜鍨涘寘瑁呭彿", Length = 50)]
public string? PalletizingUPI { get; set; }
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs
new file mode 100644
index 0000000..bdc59fd
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs
@@ -0,0 +1,179 @@
+锘縰sing Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application;
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹熀纭�杈撳叆鍙傛暟
+ /// </summary>
+ public class WmsRbLineRunModeBaseInput
+ {
+ /// <summary>
+ /// BZ01澶勭悊鐨勬澘浠�
+ /// </summary>
+ public virtual string UPI { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勬壒娆″彿
+ /// </summary>
+ public virtual string PlanNo { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勮鍗曞彿
+ /// </summary>
+ public virtual string OrderId { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勫寘瑁呭彿
+ /// </summary>
+ public virtual string PackageCode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡
+ /// </summary>
+ public virtual Admin.NET.Application.RbRunModeEnum? LineRunMode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡鍚嶇О
+ /// </summary>
+ public virtual string LineRunModeName { 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 virtual string PalletizingUPI { get; set; }
+
+ /// <summary>
+ /// 涓婁竴娆＄爜鍨涚珯鐐�
+ /// </summary>
+ public virtual int? PalletizingStation { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹垎椤垫煡璇㈣緭鍏ュ弬鏁�
+ /// </summary>
+ public class WmsRbLineRunModeInput : BasePageInput
+ {
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勬澘浠�
+ /// </summary>
+ public string? UPI { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勬壒娆″彿
+ /// </summary>
+ public string? PlanNo { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勮鍗曞彿
+ /// </summary>
+ public string? OrderId { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勫寘瑁呭彿
+ /// </summary>
+ public string? PackageCode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡
+ /// </summary>
+ public Admin.NET.Application.RbRunModeEnum? LineRunMode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡鍚嶇О
+ /// </summary>
+ public string? LineRunModeName { get; set; }
+
+ /// <summary>
+ /// 涓婁竴娆＄爜鍨涙澘浠�
+ /// </summary>
+ public string? PalletizingUPI { get; set; }
+
+ /// <summary>
+ /// 涓婁竴娆＄爜鍨涚珯鐐�
+ /// </summary>
+ public int? PalletizingStation { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹鍔犺緭鍏ュ弬鏁�
+ /// </summary>
+ public class AddWmsRbLineRunModeInput : WmsRbLineRunModeBaseInput
+ {
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
+ public override bool IsDelete { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹垹闄よ緭鍏ュ弬鏁�
+ /// </summary>
+ public class DeleteWmsRbLineRunModeInput : BaseIdInput
+ {
+ }
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹洿鏂拌緭鍏ュ弬鏁�
+ /// </summary>
+ public class UpdateWmsRbLineRunModeInput : AddWmsRbLineRunModeInput
+ {
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍖呰绾跨紦瀛樻暟鎹富閿煡璇㈣緭鍏ュ弬鏁�
+ /// </summary>
+ public class QueryByIdWmsRbLineRunModeInput : DeleteWmsRbLineRunModeInput
+ {
+
+ }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeOutput.cs
new file mode 100644
index 0000000..58c2d1d
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeOutput.cs
@@ -0,0 +1,90 @@
+锘縩amespace Admin.NET.Application;
+
+/// <summary>
+/// 鍖呰绾跨紦瀛樻暟鎹緭鍑哄弬鏁�
+/// </summary>
+public class WmsRbLineRunModeOutput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ public long? Id { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勬澘浠�
+ /// </summary>
+ public string UPI { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勬壒娆″彿
+ /// </summary>
+ public string PlanNo { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勮鍗曞彿
+ /// </summary>
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// BZ01澶勭悊鐨勫寘瑁呭彿
+ /// </summary>
+ public string PackageCode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡
+ /// </summary>
+ public Admin.NET.Application.RbRunModeEnum? LineRunMode { get; set; }
+
+ /// <summary>
+ /// 杩愯妯″紡鍚嶇О
+ /// </summary>
+ public string LineRunModeName { 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; }
+
+ /// <summary>
+ /// 涓婁竴娆＄爜鍨涙澘浠�
+ /// </summary>
+ public string PalletizingUPI { get; set; }
+
+ /// <summary>
+ /// 涓婁竴娆＄爜鍨涚珯鐐�
+ /// </summary>
+ public int? PalletizingStation { get; set; }
+
+ }
+
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs
new file mode 100644
index 0000000..5209870
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs
@@ -0,0 +1,195 @@
+锘縰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.WmsOrderGroupName, Order = 100)]
+public class WmsRbLineRunModeService : IDynamicApiController, ITransient
+{
+ private readonly SqlSugarRepository<WmsRbLineRunMode> _rep;
+ public WmsRbLineRunModeService(SqlSugarRepository<WmsRbLineRunMode> rep)
+ {
+ _rep = rep;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ鍖呰绾跨紦瀛樻暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Page")]
+ [Description("WmsRbLineRunMode/Page")]
+ public async Task<SqlSugarPagedList<WmsRbLineRunModeOutput>> Page(WmsRbLineRunModeInput 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("WmsRbLineRunMode/List")]
+ public async Task<List<WmsRbLineRunModeOutput>> List([FromQuery] WmsRbLineRunModeInput input)
+ {
+ var query = CommonPageFilter(input);
+ return await query.OrderBuilder(input, "", "Id").Select<WmsRbLineRunModeOutput>().ToListAsync();
+ }
+
+ /// <summary>
+ /// 澧炲姞鍖呰绾跨紦瀛樻暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Add")]
+ [Description("WmsRbLineRunMode/Add")]
+ public async Task<long> Add(AddWmsRbLineRunModeInput input)
+ {
+ var entity = input.Adapt<WmsRbLineRunMode>();
+
+ //閲嶅鎬ч獙璇�
+ await CheckExist(entity);
+
+ await _rep.InsertAsync(entity);
+ return entity.Id;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍖呰绾跨紦瀛樻暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Delete")]
+ [Description("WmsRbLineRunMode/Delete")]
+ public async Task Delete(DeleteWmsRbLineRunModeInput 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("WmsRbLineRunMode/Update")]
+ public async Task Update(UpdateWmsRbLineRunModeInput input)
+ {
+ var entity = input.Adapt<WmsRbLineRunMode>();
+
+ //閲嶅鎬ч獙璇�
+ 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("WmsRbLineRunMode/Detail")]
+ public async Task<WmsRbLineRunMode> Detail([FromQuery] QueryByIdWmsRbLineRunModeInput input)
+ {
+ return await _rep.GetFirstAsync(u => u.Id == input.Id);
+ }
+
+
+
+
+
+
+ #region 绉佹湁鏂规硶
+
+ /// <summary>
+ /// 鍏叡鏌ヨ鍖呰绾跨紦瀛樻暟鎹潯浠�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private ISugarQueryable<WmsRbLineRunModeOutput> CommonPageFilter(WmsRbLineRunModeInput input)
+ {
+ var query = _rep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
+ u.UPI.Contains(input.SearchKey.Trim())
+ || u.PlanNo.Contains(input.SearchKey.Trim())
+ || u.OrderId.Contains(input.SearchKey.Trim())
+ || u.PackageCode.Contains(input.SearchKey.Trim())
+ || u.LineRunModeName.Contains(input.SearchKey.Trim())
+ || u.CreateUserName.Contains(input.SearchKey.Trim())
+ || u.UpdateUserName.Contains(input.SearchKey.Trim())
+ || u.PalletizingUPI.Contains(input.SearchKey.Trim())
+ )
+ .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
+ .WhereIF(input.LineRunMode.HasValue, u => u.LineRunMode == input.LineRunMode)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.LineRunModeName), u => u.LineRunModeName.Contains(input.LineRunModeName.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PalletizingUPI), u => u.PalletizingUPI.Contains(input.PalletizingUPI.Trim()))
+ .WhereIF(input.PalletizingStation>0, u => u.PalletizingStation == input.PalletizingStation)
+ .Select<WmsRbLineRunModeOutput>();
+ return query;
+ }
+
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsRbLineRunMode input,bool isEdit=false)
+ {
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsRbLineRunMode> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+ }
+ #endregion
+
+}
+
--
Gitblit v1.9.3