CC/iWareCC_ASRS/ThreadService/01_BZ01¹¤Î»£¨Çå»Ò£¬Ï´°åºó¹¤Î»£©/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; LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsRbLineRunMode.ts
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ import 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 } }); 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="请è¾å ¥BZ01å¤ççæ¿ä»¶" 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="请è¾å ¥BZ01å¤ççæ¹æ¬¡å·" 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="请è¾å ¥BZ01å¤çç订åå·" 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="请è¾å ¥BZ01å¤ççå è£ å·" 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> 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="请è¾å ¥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.planNo" clearable="" placeholder="请è¾å ¥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.orderId" clearable="" placeholder="请è¾å ¥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.packageCode" clearable="" placeholder="请è¾å ¥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="è¿è¡æ¨¡å¼"> <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> 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> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,179 @@ using 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> /// å建人Id /// </summary> public virtual long? CreateUserId { get; set; } /// <summary> /// å建人 /// </summary> public virtual string CreateUserName { get; set; } /// <summary> /// ä¿®æ¹äººId /// </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 { } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/Dto/WmsRbLineRunModeOutput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,90 @@ namespace 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> /// å建人Id /// </summary> public long? CreateUserId { get; set; } /// <summary> /// å建人 /// </summary> public string CreateUserName { get; set; } /// <summary> /// ä¿®æ¹äººId /// </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; } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/WmsRbLineRunMode/WmsRbLineRunModeService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,195 @@ using 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 }