From 6143bf1429551edd4d71f45b120bc99689031e40 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 15:32:02 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiFlagEnum.cs | 26 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs | 20 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs | 5
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs | 10
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue | 21 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs | 6
LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/机器人任务表导入模板.xlsx | 0
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue | 14
LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue | 10
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs | 7
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs | 1
LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/批次数据导入模板.xlsx | 0
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue | 19 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 33 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs | 8
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs | 5
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs | 10
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue | 37 ++
LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue | 12
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs | 10
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs | 566 ++++++++++++++++++-------------------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 18 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs | 35 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs | 2
24 files changed, 553 insertions(+), 322 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue
index 1ca3255..e7718b2 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue
@@ -20,6 +20,16 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏍囪" prop="upiFlag">
+ <el-select clearable v-model="ruleForm.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData" :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="info5">
<el-input v-model="ruleForm.info5" placeholder="璇疯緭鍏ョ敓浜у崟鍙�" maxlength="60" show-word-limit clearable />
@@ -147,7 +157,10 @@
import { ElMessage } from "element-plus";
import type { FormRules } from "element-plus";
import { addMes_Package_UnLine_Record, updateMes_Package_UnLine_Record, detailMes_Package_UnLine_Record } from "/@/api/main/ReportCenter/mes_Package_UnLine_Record";
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+ const getEnumUpiFlagData = ref<any>([]);
//鐖剁骇浼犻�掓潵鐨勫弬鏁�
var props = defineProps({
title: {
@@ -237,6 +250,7 @@
// 椤甸潰鍔犺浇鏃�
onMounted(async () => {
+ getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue
index 1dcc07b..3878ce5 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue
@@ -16,6 +16,15 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
+ <el-form-item label="鏍囪">
+ <el-select clearable="" v-model="queryParamsMes_Package_UnLine_Record.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData_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="showAdvanceQueryUIMes_Package_UnLine_Record">
<el-form-item label="鐢熶骇鍗曞彿">
<el-input v-model="queryParamsMes_Package_UnLine_Record.info5" clearable="" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"/>
@@ -133,6 +142,11 @@
border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
<el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
<el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
<el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
@@ -194,8 +208,13 @@
import printDialogMes_Package_UnLine_Record from '/@/views/system/print/component/hiprint/preview.vue'
import { pageMes_Package_UnLine_Record, deleteMes_Package_UnLine_Record,importExcelMes_Package_UnLine_Record,downloadExcelTemplateMes_Package_UnLine_Record } from '/@/api/main/ReportCenter/mes_Package_UnLine_Record';
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+ import commonFunction from '/@/utils/commonFunction';
+ const getEnumUpiFlagData_Index = ref<any>([]);
+ const { getEnumDesc } = commonFunction();
/***************************************************[鍖呬笅绾胯褰曟搷浣淽寮�濮�***************************************************/
const showAdvanceQueryUIMes_Package_UnLine_Record = ref(false);
@@ -297,6 +316,7 @@
/***************************************************[鍖呬笅绾胯褰曞鍑篯寮�濮�***************************************************/
//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
const functionMapMes_Package_UnLine_Record = {
+ getEnumUpiFlagData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -321,6 +341,7 @@
/***************************************************[鍖呬笅绾胯褰曞鍑篯缁撴潫***************************************************/
// 鍖呬笅绾胯褰曢〉闈㈠姞杞芥椂
onMounted(async () => {
+ getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
handleQueryMes_Package_UnLine_Record();
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
index 5e346a1..24f2284 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -13,8 +13,8 @@
<el-input v-model="ruleForm.id" />
</el-form-item>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="閮ㄤ欢鏉＄爜" prop="upi">
- <el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+ <el-form-item label="閮ㄤ欢鏉＄爜" prop="uPI">
+ <el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
</el-form-item>
@@ -249,6 +249,16 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏍囪" prop="upiFlag">
+ <el-select clearable v-model="ruleForm.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+
+ </el-select>
+
+ </el-form-item>
+
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -277,6 +287,7 @@
const getEnumAreaCodeData = ref<any>([]);
const getEnumUpiStatusData = ref<any>([]);
+ const getEnumUpiFlagData = ref<any>([]);
//鐖剁骇浼犻�掓潵鐨勫弬鏁�
var props = defineProps({
title: {
@@ -293,7 +304,7 @@
const ruleForm = ref<any>({});
//鑷娣诲姞鍏朵粬瑙勫垯
const rules = ref<FormRules>({
- upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+ uPI: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
upiStatus: [{required: true, message: '璇烽�夋嫨鏉挎枡鐘舵�侊紒', trigger: 'change',},],
@@ -374,6 +385,7 @@
onMounted(async () => {
getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 9db41ab..1958672 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -11,7 +11,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
<el-form-item label="閮ㄤ欢鏉＄爜">
- <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+ <el-input v-model="queryParamsMes_BatchOrderUPI_New.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -213,6 +213,15 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
+ <el-form-item label="鏍囪">
+ <el-select clearable="" v-model="queryParamsMes_BatchOrderUPI_New.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData_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="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -241,11 +250,10 @@
@sort-change="sortChangeMes_BatchOrderUPI_New"
border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" width="180" show-overflow-tooltip="" />
- <el-table-column prop="info5" label="鐢熶骇鍗曞彿" width="130" show-overflow-tooltip="" />
- <el-table-column prop="packageCode" label="鍖呰缂栫爜" width="180" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规鍙�" width="130" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" width="130" show-overflow-tooltip="" />
+ <el-table-column prop="uPI" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
<el-table-column prop="areaCode" label="鎵�鍦ㄥ尯鍩�" show-overflow-tooltip="" >
<template #default="scope">
<el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -261,6 +269,7 @@
<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
<el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
<el-table-column prop="isPA" label="鏄惁浼樺寲鍖呰" show-overflow-tooltip="" />
+ <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
<el-table-column prop="machineXCenter" label="鍖呰X鍧愭爣" show-overflow-tooltip="" />
<el-table-column prop="machineYCenter" label="鍖呰Y鍧愭爣" show-overflow-tooltip="" />
<el-table-column prop="machineZCenter" label="鍖呰Z鍧愭爣" show-overflow-tooltip="" />
@@ -274,11 +283,11 @@
<el-table-column prop="info7" label="缁忛攢搴楀悕绉�" show-overflow-tooltip="" />
<el-table-column prop="info8" label="浜у搧鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip="" />
-
+ <el-table-column prop="info9" label="鍖呰缂栫爜" show-overflow-tooltip="" />
<el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip="" />
<el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" show-overflow-tooltip="" />
<el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip="" />
- <!-- <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" /> -->
+ <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="info15" label="閮ㄤ欢鏁伴噺" show-overflow-tooltip="" />
<el-table-column prop="info16" label="閮ㄤ欢灏哄" show-overflow-tooltip="" />
<el-table-column prop="info17" label="鏈烘鑷傛槸鍚︽棆杞�" show-overflow-tooltip="" />
@@ -286,6 +295,11 @@
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_BatchOrderUPI_New:update') || auth('mes_BatchOrderUPI_New:delete')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_BatchOrderUPI_New(scope.row)" v-auth="'mes_BatchOrderUPI_New:update'"> 缂栬緫 </el-button>
@@ -342,6 +356,7 @@
const getEnumAreaCodeData_Index = ref<any>([]);
const getEnumUpiStatusData_Index = ref<any>([]);
+ const getEnumUpiFlagData_Index = ref<any>([]);
const { getEnumDesc } = commonFunction();
@@ -469,6 +484,7 @@
const functionMapMes_BatchOrderUPI_New = {
getEnumAreaCodeData_Index,
getEnumUpiStatusData_Index,
+ getEnumUpiFlagData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -495,6 +511,7 @@
onMounted(async () => {
getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
handleQueryMes_BatchOrderUPI_New();
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue
index c4db1cc..e386e60 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue
@@ -61,6 +61,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏄惁榻愬寘" prop="isQiBao">
+ <el-switch v-model="ruleForm.isQiBao" active-text="鏄�" inactive-text="鍚�" />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="绾哥闀�" prop="info1">
<el-input v-model="ruleForm.info1" placeholder="璇疯緭鍏ョ焊绠遍暱" maxlength="53" show-word-limit clearable />
@@ -137,6 +144,16 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏍囪" prop="upiFlag">
+ <el-select clearable v-model="ruleForm.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+
+ </el-select>
+
+ </el-form-item>
+
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -165,6 +182,7 @@
const getEnumAreaCodeData = ref<any>([]);
const getEnumUpiStatusData = ref<any>([]);
+ const getEnumUpiFlagData = ref<any>([]);
//鐖剁骇浼犻�掓潵鐨勫弬鏁�
var props = defineProps({
title: {
@@ -257,6 +275,7 @@
onMounted(async () => {
getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
index 5a15001..37fdd0b 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue
@@ -52,6 +52,15 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
+ <el-form-item label="鏄惁榻愬寘">
+ <el-select clearable="" v-model="queryParamsMes_Package_Gather.isQiBao" placeholder="璇烽�夋嫨鏄惁榻愬寘">
+ <el-option v-for="(item,index) in getEnumIsQiBaoData_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="showAdvanceQueryUIMes_Package_Gather">
<el-form-item label="绾哥闀�">
<el-input v-model="queryParamsMes_Package_Gather.info1" clearable="" placeholder="璇疯緭鍏ョ焊绠遍暱"/>
@@ -117,6 +126,15 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
+ <el-form-item label="鏍囪">
+ <el-select clearable="" v-model="queryParamsMes_Package_Gather.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+ <el-option v-for="(item,index) in getEnumUpiFlagData_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="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -158,6 +176,14 @@
<el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
</template>
</el-table-column>
+ <el-table-column prop="isQiBao" label="鏄惁榻愬寘" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isQiBao"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
<el-table-column prop="info1" label="绾哥闀�" show-overflow-tooltip="" />
<el-table-column prop="info2" label="绾哥瀹�" show-overflow-tooltip="" />
<el-table-column prop="info3" label="绾哥楂�" show-overflow-tooltip="" />
@@ -173,6 +199,11 @@
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
<el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <el-table-column prop="upiFlag" label="鏍囪" show-overflow-tooltip="" >
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_Gather:update') || auth('mes_Package_Gather:delete')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_Gather(scope.row)" v-auth="'mes_Package_Gather:update'"> 缂栬緫 </el-button>
@@ -222,6 +253,8 @@
const getEnumAreaCodeData_Index = ref<any>([]);
const getEnumUpiStatusData_Index = ref<any>([]);
+ const getEnumIsQiBaoData_Index = ref<any>([]);
+ const getEnumUpiFlagData_Index = ref<any>([]);
const { getEnumDesc } = commonFunction();
@@ -327,6 +360,8 @@
const functionMapMes_Package_Gather = {
getEnumAreaCodeData_Index,
getEnumUpiStatusData_Index,
+ getEnumIsQiBaoData_Index,
+ getEnumUpiFlagData_Index,
formatDate_T_Date,
formatDate_T_Time
};
@@ -353,6 +388,8 @@
onMounted(async () => {
getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+ getEnumIsQiBaoData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
+ getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
});
handleQueryMes_Package_Gather();
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
index 500304c..cf007fc 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue
@@ -27,8 +27,8 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="閮ㄤ欢鏉＄爜" prop="upi">
- <el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+ <el-form-item label="閮ㄤ欢鏉＄爜" prop="uPI">
+ <el-input v-model="ruleForm.uPI" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
</el-form-item>
@@ -132,14 +132,14 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="涓嬪彂鏃堕棿" prop="issueTime">
- <el-date-picker v-model="ruleForm.issueTime" type="date" placeholder="涓嬪彂鏃堕棿" />
+ <el-date-picker v-model="ruleForm.issueTime" type="datetime" 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="finishedTime">
- <el-date-picker v-model="ruleForm.finishedTime" type="date" placeholder="浠诲姟瀹屾垚鏃堕棿" />
+ <el-date-picker v-model="ruleForm.finishedTime" type="datetime" placeholder="浠诲姟瀹屾垚鏃堕棿" />
</el-form-item>
@@ -196,7 +196,7 @@
//鑷娣诲姞鍏朵粬瑙勫垯
const rules = ref<FormRules>({
taskNo: [{required: true, message: '璇疯緭鍏ヤ换鍔″彿锛�', trigger: 'blur',},],
- upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+ uPI: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
length: [{required: true, message: '璇疯緭鍏ラ暱锛�', trigger: 'blur',},],
width: [{required: true, message: '璇疯緭鍏ュ锛�', trigger: 'blur',},],
thk: [{required: true, message: '璇疯緭鍏ュ帤锛�', trigger: 'blur',},],
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
index d10b29e..6c153cb 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue
@@ -23,7 +23,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="閮ㄤ欢鏉＄爜">
- <el-input v-model="queryParamsWmsRbLineTask.upi" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
+ <el-input v-model="queryParamsWmsRbLineTask.uPI" clearable="" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�"/>
</el-form-item>
</el-col>
@@ -113,13 +113,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="涓嬪彂鏃堕棿">
- <el-date-picker placeholder="璇烽�夋嫨涓嬪彂鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
+ <el-date-picker placeholder="璇烽�夋嫨涓嬪彂鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
<el-form-item label="浠诲姟瀹屾垚鏃堕棿">
- <el-date-picker placeholder="璇烽�夋嫨浠诲姟瀹屾垚鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
+ <el-date-picker placeholder="璇烽�夋嫨浠诲姟瀹屾垚鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
</el-form-item>
</el-col>
@@ -162,7 +162,7 @@
<el-table-column type="index" label="搴忓彿" width="55" align="center"/>
<el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
<el-table-column prop="taskName" label="浠诲姟鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
+ <el-table-column prop="uPI" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
<el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
<el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
<el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
@@ -184,8 +184,8 @@
<el-table-column prop="taskStatusName" label="浠诲姟鐘舵�佸悕绉�" show-overflow-tooltip="" />
<el-table-column prop="taskDescribe" label="浠诲姟鎻忚堪" show-overflow-tooltip="" />
<el-table-column prop="taskMsg" label="浠诲姟娑堟伅" show-overflow-tooltip="" />
- <el-table-column prop="issueTime" label="涓嬪彂鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="finishedTime" label="浠诲姟瀹屾垚鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="issueTime" label="涓嬪彂鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="finishedTime" label="浠诲姟瀹屾垚鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="isFlagFinish" label="鏄惁鏍囪寮哄埗瀹屾垚" show-overflow-tooltip="">
<template #default="scope">
<el-tag v-if="scope.row.isFlagFinish"> 鏄� </el-tag>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
index 77a7d63..2f0bdca 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs
@@ -50,6 +50,13 @@
[SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "鏍囪")]
+ public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.姝ｅ父;
+
+
#endregion
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
index f6c5d16..2f86968 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
@@ -53,6 +53,12 @@
/// <summary>
+ /// 鏍囪
+ /// </summary>
+ [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "鏍囪")]
+ public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.姝ｅ父;
+
+ /// <summary>
/// 鏄惁榻愬寘
/// </summary>
[SugarColumn(ColumnName = "IsQiBao", ColumnDescription = "鏄惁榻愬寘")]
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs
index a643823..f0e7655 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs
@@ -18,6 +18,12 @@
public string PackageCode { get; set; }
/// <summary>
+ /// 鏍囪
+ /// </summary>
+ [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "鏍囪")]
+ public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.姝ｅ父;
+
+ /// <summary>
/// 鐢熶骇鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
@@ -31,7 +37,7 @@
[SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
public string OrderId { get; set; }
-
+
[SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiFlagEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiFlagEnum.cs
new file mode 100644
index 0000000..e541d08
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiFlagEnum.cs
@@ -0,0 +1,26 @@
+锘�
+
+using System.ComponentModel;
+
+namespace Admin.NET.Application;
+
+/// <summary>
+/// 鏉挎枡鏍囪鏋氫妇
+/// </summary>
+[Description("鏉挎枡鏍囪鏋氫妇")]
+public enum UpiFlagEnum
+{
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
+ [Description("姝ｅ父")]
+ 姝ｅ父 = 0,
+
+ /// <summary>
+ /// NG
+ /// </summary>
+ [Description("NG")]
+ NG = 1,
+
+
+}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs
index aadc555..4bb959c 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs
@@ -14,6 +14,11 @@
public virtual string PackageCode { get; set; }
/// <summary>
+ /// 鏍囪
+ /// </summary>
+ public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
+ /// <summary>
/// 鐢熶骇鍗曞彿
/// </summary>
public virtual string Info5 { get; set; }
@@ -141,6 +146,11 @@
public string? PackageCode { get; set; }
/// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
+ /// <summary>
/// 鐢熶骇鍗曞彿
/// </summary>
public string? Info5 { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs
index 0941b05..997a3fe 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs
@@ -16,6 +16,11 @@
public string PackageCode { get; set; }
/// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
+ /// <summary>
/// 鐢熶骇鍗曞彿
/// </summary>
public string Info5 { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs
index e525bd6..6f78a22 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs
@@ -143,6 +143,7 @@
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
+ .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.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()))
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
index a7e559b..6305717 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
@@ -208,6 +208,11 @@
/// </summary>
public virtual bool IsDelete { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
/// <summary>
@@ -385,6 +390,11 @@
/// </summary>
public string? Info17 { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
index 6488fce..31f7599 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
@@ -210,6 +210,11 @@
/// </summary>
public bool IsDelete { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
index 130f7d3..aca858e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
@@ -184,6 +184,7 @@
var _Info15 = "";//閮ㄤ欢鏁伴噺
var _Info16 = "";//閮ㄤ欢灏哄
var _Info17 = "";//鏈烘鑷傛槸鍚︽棆杞�
+ var _UpiFlag = "";//鏍囪
#endregion
@@ -221,6 +222,7 @@
_Info15 = row["閮ㄤ欢鏁伴噺"]?.ToString() ;
_Info16 = row["閮ㄤ欢灏哄"]?.ToString() ;
_Info17 = row["鏈烘鑷傛槸鍚︽棆杞�"]?.ToString() ;
+ _UpiFlag = row["鏍囪"]?.ToString() ;
#endregion
@@ -309,12 +311,6 @@
throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
}
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsPA))
{
@@ -342,7 +338,7 @@
{
addItem.PackageCode = (string)(_PackageCode.Trim());
}
-
+
if(!string.IsNullOrEmpty(_Sequence))
{
if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
@@ -375,7 +371,15 @@
}
}
-
+
+ if(!string.IsNullOrEmpty(_Info4))
+ {
+ addItem.Info4 = (string)(_Info4.Trim());
+ }
+ if(!string.IsNullOrEmpty(_Info6))
+ {
+ addItem.Info6 = (string)(_Info6.Trim());
+ }
if(!string.IsNullOrEmpty(_Info7))
{
addItem.Info7 = (string)(_Info7.Trim());
@@ -431,6 +435,20 @@
if(!string.IsNullOrEmpty(_Info17))
{
addItem.Info17 = (string)(_Info17.Trim());
+ }
+ if(!string.IsNullOrEmpty(_UpiFlag))
+ {
+ Admin.NET.Application.UpiFlagEnum enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
+
+ if(!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag)&&!string.IsNullOrEmpty(_UpiFlag))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囪]{_UpiFlag}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.UpiFlag = enumUpiFlag;
+ }
+
}
#endregion
@@ -514,6 +532,7 @@
.WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
+ .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.Select<Mes_BatchOrderUPI_NewOutput>();
return query;
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs
index f7e553e..01c63ab 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs
@@ -39,6 +39,11 @@
public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
/// <summary>
+ /// 鏄惁榻愬寘
+ /// </summary>
+ public virtual bool? IsQiBao { get; set; }
+
+ /// <summary>
/// 绾哥闀�
/// </summary>
public virtual float? Info1 { get; set; }
@@ -128,6 +133,11 @@
/// </summary>
public virtual bool IsDelete { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
/// <summary>
@@ -169,6 +179,11 @@
/// 鏉挎枡鐘舵��
/// </summary>
public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
+
+ /// <summary>
+ /// 鏄惁榻愬寘
+ /// </summary>
+ public bool? IsQiBao { get; set; }
/// <summary>
/// 绾哥闀�
@@ -225,6 +240,11 @@
/// </summary>
public string? Info13 { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs
index e986f0f..666b5ee 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs
@@ -41,6 +41,11 @@
public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
/// <summary>
+ /// 鏄惁榻愬寘
+ /// </summary>
+ public bool? IsQiBao { get; set; }
+
+ /// <summary>
/// 绾哥闀�
/// </summary>
public float? Info1 { get; set; }
@@ -130,6 +135,11 @@
/// </summary>
public bool IsDelete { get; set; }
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
+
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs
index 51e6650..23f6d0f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs
@@ -147,6 +147,7 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
.WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
.WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
+ .WhereIF(input.IsQiBao.HasValue, u => u.IsQiBao == input.IsQiBao)
.WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim()))
@@ -155,6 +156,7 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim()))
+ .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
.Select<Mes_Package_GatherOutput>();
return query;
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
index a007bc2..989500d 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs
@@ -92,7 +92,7 @@
var entity = input.Adapt<WmsRbLineTask>();
//閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
+ await CheckExist(entity,true);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
@@ -115,7 +115,7 @@
#region 瀵煎叆
-
+
/// <summary>
/// Excel妯℃澘瀵煎叆鏈哄櫒浜轰换鍔¤〃鍔熻兘
/// </summary>
@@ -125,15 +125,15 @@
[ApiDescriptionSettings(Name = "ImportExcel")]
[Description("WmsRbLineTask/ImportExcel")]
public async Task<int> ImportExcelAsync(IFormFile file)
- {
+ {
int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList = await CommonImport(importDataTable, _DataStartLine);
+ var addList =await CommonImport(importDataTable, _DataStartLine);
await _rep.InsertRangeAsync(addList);
return addList.Count;
}
-
+
/// <summary>
/// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
/// </summary>
@@ -148,234 +148,218 @@
{
index++;
//瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new WmsRbLineTask();
- #region 瀹氫箟鍙橀噺
- var _TaskNo = "";//浠诲姟鍙�
- var _TaskName = "";//浠诲姟鍚嶇О
- var _UPI = "";//閮ㄤ欢鏉＄爜
- var _Length = "";//闀�
- var _Width = "";//瀹�
- var _Thk = "";//鍘�
- var _PlanNo = "";//鎵规鍙�
- var _OrderId = "";//璁㈠崟鍙�
- var _PackageCode = "";//鍖呰鍙�
- var _PlaceCode = "";//搴撲綅缂栫爜
- var _RbTaskType = "";//浠诲姟绫诲瀷
- var _RbTaskTypeEnumName = "";//浠诲姟绫诲瀷鍚嶇О
- var _TaskStatus = "";//浠诲姟鐘舵��
- var _TaskStatusName = "";//浠诲姟鐘舵�佸悕绉�
- var _TaskDescribe = "";//浠诲姟鎻忚堪
- var _TaskMsg = "";//浠诲姟娑堟伅
- var _IssueTime = "";//涓嬪彂鏃堕棿
- var _FinishedTime = "";//浠诲姟瀹屾垚鏃堕棿
- var _IsFlagFinish = "";//鏄惁鏍囪寮哄埗瀹屾垚
- #endregion
-
-
- #region 鍙栧��
- _TaskNo = row["浠诲姟鍙�"]?.ToString();
- _TaskName = row["浠诲姟鍚嶇О"]?.ToString();
- _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString();
- _Length = row["闀�"]?.ToString();
- _Width = row["瀹�"]?.ToString();
- _Thk = row["鍘�"]?.ToString();
- _PlanNo = row["鎵规鍙�"]?.ToString();
- _OrderId = row["璁㈠崟鍙�"]?.ToString();
- _PackageCode = row["鍖呰鍙�"]?.ToString();
- _PlaceCode = row["搴撲綅缂栫爜"]?.ToString();
- _RbTaskType = row["浠诲姟绫诲瀷"]?.ToString();
- _RbTaskTypeEnumName = row["浠诲姟绫诲瀷鍚嶇О"]?.ToString();
- _TaskStatus = row["浠诲姟鐘舵��"]?.ToString();
- _TaskStatusName = row["浠诲姟鐘舵�佸悕绉�"]?.ToString();
- _TaskDescribe = row["浠诲姟鎻忚堪"]?.ToString();
- _TaskMsg = row["浠诲姟娑堟伅"]?.ToString();
- _IssueTime = row["涓嬪彂鏃堕棿"]?.ToString();
- _FinishedTime = row["浠诲姟瀹屾垚鏃堕棿"]?.ToString();
- _IsFlagFinish = row["鏄惁鏍囪寮哄埗瀹屾垚"]?.ToString();
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_TaskNo))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鍙穄{_TaskNo}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_TaskNo))
- {
- addItem.TaskNo = (string)(_TaskNo.Trim());
- }
- if (!string.IsNullOrEmpty(_TaskName))
- {
- addItem.TaskName = (string)(_TaskName.Trim());
- }
-
- if (string.IsNullOrEmpty(_UPI))
- {
- throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_UPI))
- {
- addItem.UPI = (string)(_UPI.Trim());
- }
-
- if (string.IsNullOrEmpty(_Length))
- {
- throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
- }
-
- //if(!string.IsNullOrEmpty(_Length))
- //{
- // addItem.Length = (float)(_Length.Trim());
- // }
-
- //if (string.IsNullOrEmpty(_Width))
- //{
- // throw Oops.Oh($"绗瑊index}琛孾瀹絔{_Width}涓嶈兘涓虹┖锛�");
- //}
-
- //if(!string.IsNullOrEmpty(_Width))
- //{
- // addItem.Width = (float)(_Width.Trim());
- // }
-
- if (string.IsNullOrEmpty(_Thk))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
- }
-
- //if(!string.IsNullOrEmpty(_Thk))
- //{
- // addItem.Thk = (float)(_Thk.Trim());
- // }
-
- if (string.IsNullOrEmpty(_PlanNo))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵规鍙穄{_PlanNo}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PlanNo))
- {
- addItem.PlanNo = (string)(_PlanNo.Trim());
- }
-
- if (string.IsNullOrEmpty(_OrderId))
- {
- throw Oops.Oh($"绗瑊index}琛孾璁㈠崟鍙穄{_OrderId}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_OrderId))
- {
- addItem.OrderId = (string)(_OrderId.Trim());
- }
-
- if (string.IsNullOrEmpty(_PackageCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍖呰鍙穄{_PackageCode}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PackageCode))
- {
- addItem.PackageCode = (string)(_PackageCode.Trim());
- }
-
- if (string.IsNullOrEmpty(_PlaceCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅缂栫爜]{_PlaceCode}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PlaceCode))
- {
- addItem.PlaceCode = (string)(_PlaceCode.Trim());
- }
- if (!string.IsNullOrEmpty(_RbTaskType))
- {
- Admin.NET.Application.RbTaskTypeEnum enumRbTaskType = default(Admin.NET.Application.RbTaskTypeEnum);
-
- if (!Enum.TryParse<Admin.NET.Application.RbTaskTypeEnum>(_RbTaskType, out enumRbTaskType) && !string.IsNullOrEmpty(_RbTaskType))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟绫诲瀷]{_RbTaskType}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.RbTaskType = enumRbTaskType;
- }
-
- }
- if (!string.IsNullOrEmpty(_RbTaskTypeEnumName))
- {
- addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
- }
-
- if (string.IsNullOrEmpty(_TaskStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_TaskStatus))
- {
- Admin.NET.Application.TaskStatusEnum enumTaskStatus = default(Admin.NET.Application.TaskStatusEnum);
-
- if (!Enum.TryParse<Admin.NET.Application.TaskStatusEnum>(_TaskStatus, out enumTaskStatus) && !string.IsNullOrEmpty(_TaskStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- addItem.TaskStatus = enumTaskStatus;
- }
-
- }
-
- if (string.IsNullOrEmpty(_TaskStatusName))
- {
- throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�佸悕绉癩{_TaskStatusName}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_TaskStatusName))
- {
- addItem.TaskStatusName = (string)(_TaskStatusName.Trim());
- }
- if (!string.IsNullOrEmpty(_TaskDescribe))
- {
- addItem.TaskDescribe = (string)(_TaskDescribe.Trim());
- }
- if (!string.IsNullOrEmpty(_TaskMsg))
- {
- addItem.TaskMsg = (string)(_TaskMsg.Trim());
- }
- if (!string.IsNullOrEmpty(_IssueTime))
- {
- addItem.IssueTime = Convert.ToDateTime(Convert.ToDateTime(_IssueTime.Trim()).ToShortDateString());
- }
- if (!string.IsNullOrEmpty(_FinishedTime))
- {
- addItem.FinishedTime = Convert.ToDateTime(Convert.ToDateTime(_FinishedTime.Trim()).ToShortDateString());
- }
-
- if (string.IsNullOrEmpty(_IsFlagFinish))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_IsFlagFinish))
- {
- if (!_IsFlagFinish.Equals("鏄�") && !_IsFlagFinish.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsFlagFinish = _IsFlagFinish.Equals("鏄�") ? true : false;
- addItem.IsFlagFinish = outIsFlagFinish;
- }
- }
-
- #endregion
-
+
+ var addItem = new WmsRbLineTask();
+ #region 瀹氫箟鍙橀噺
+ var _TaskNo = "";//浠诲姟鍙�
+ var _TaskName = "";//浠诲姟鍚嶇О
+ var _UPI = "";//閮ㄤ欢鏉＄爜
+ var _Length = "";//闀�
+ var _Width = "";//瀹�
+ var _Thk = "";//鍘�
+ var _PlanNo = "";//鎵规鍙�
+ var _OrderId = "";//璁㈠崟鍙�
+ var _PackageCode = "";//鍖呰鍙�
+ var _PlaceCode = "";//搴撲綅缂栫爜
+ var _RbTaskType = "";//浠诲姟绫诲瀷
+ var _RbTaskTypeEnumName = "";//浠诲姟绫诲瀷鍚嶇О
+ var _TaskStatus = "";//浠诲姟鐘舵��
+ var _TaskStatusName = "";//浠诲姟鐘舵�佸悕绉�
+ var _TaskDescribe = "";//浠诲姟鎻忚堪
+ var _TaskMsg = "";//浠诲姟娑堟伅
+ var _IssueTime = "";//涓嬪彂鏃堕棿
+ var _FinishedTime = "";//浠诲姟瀹屾垚鏃堕棿
+ var _IsFlagFinish = "";//鏄惁鏍囪寮哄埗瀹屾垚
+ #endregion
+
+
+ #region 鍙栧��
+ _TaskNo = row["浠诲姟鍙�"]?.ToString() ;
+ _TaskName = row["浠诲姟鍚嶇О"]?.ToString() ;
+ _UPI = row["閮ㄤ欢鏉＄爜"]?.ToString() ;
+ _Length = row["闀�"]?.ToString() ;
+ _Width = row["瀹�"]?.ToString() ;
+ _Thk = row["鍘�"]?.ToString() ;
+ _PlanNo = row["鎵规鍙�"]?.ToString() ;
+ _OrderId = row["璁㈠崟鍙�"]?.ToString() ;
+ _PackageCode = row["鍖呰鍙�"]?.ToString() ;
+ _PlaceCode = row["搴撲綅缂栫爜"]?.ToString() ;
+ _RbTaskType = row["浠诲姟绫诲瀷"]?.ToString() ;
+ _RbTaskTypeEnumName = row["浠诲姟绫诲瀷鍚嶇О"]?.ToString() ;
+ _TaskStatus = row["浠诲姟鐘舵��"]?.ToString() ;
+ _TaskStatusName = row["浠诲姟鐘舵�佸悕绉�"]?.ToString() ;
+ _TaskDescribe = row["浠诲姟鎻忚堪"]?.ToString() ;
+ _TaskMsg = row["浠诲姟娑堟伅"]?.ToString() ;
+ _IssueTime = row["涓嬪彂鏃堕棿"]?.ToString() ;
+ _FinishedTime = row["浠诲姟瀹屾垚鏃堕棿"]?.ToString() ;
+ _IsFlagFinish = row["鏄惁鏍囪寮哄埗瀹屾垚"]?.ToString() ;
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_TaskNo))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾浠诲姟鍙穄{_TaskNo}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_TaskNo))
+ {
+ addItem.TaskNo = (string)(_TaskNo.Trim());
+ }
+ if(!string.IsNullOrEmpty(_TaskName))
+ {
+ addItem.TaskName = (string)(_TaskName.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_UPI))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾閮ㄤ欢鏉＄爜]{_UPI}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_UPI))
+ {
+ addItem.UPI = (string)(_UPI.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_Length))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾闀縘{_Length}涓嶈兘涓虹┖锛�");
+ }
+
+
+
+ if (string.IsNullOrEmpty(_Thk))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鍘歖{_Thk}涓嶈兘涓虹┖锛�");
+ }
+
+
+
+ if (string.IsNullOrEmpty(_PlanNo))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎵规鍙穄{_PlanNo}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_PlanNo))
+ {
+ addItem.PlanNo = (string)(_PlanNo.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_OrderId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾璁㈠崟鍙穄{_OrderId}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_OrderId))
+ {
+ addItem.OrderId = (string)(_OrderId.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_PackageCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鍖呰鍙穄{_PackageCode}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_PackageCode))
+ {
+ addItem.PackageCode = (string)(_PackageCode.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_PlaceCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾搴撲綅缂栫爜]{_PlaceCode}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_PlaceCode))
+ {
+ addItem.PlaceCode = (string)(_PlaceCode.Trim());
+ }
+ if(!string.IsNullOrEmpty(_RbTaskType))
+ {
+ Admin.NET.Application.RbTaskTypeEnum enumRbTaskType = default(Admin.NET.Application.RbTaskTypeEnum);
+
+ if(!Enum.TryParse<Admin.NET.Application.RbTaskTypeEnum>(_RbTaskType, out enumRbTaskType)&&!string.IsNullOrEmpty(_RbTaskType))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾浠诲姟绫诲瀷]{_RbTaskType}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.RbTaskType = enumRbTaskType;
+ }
+
+ }
+ if(!string.IsNullOrEmpty(_RbTaskTypeEnumName))
+ {
+ addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_TaskStatus))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_TaskStatus))
+ {
+ Admin.NET.Application.TaskStatusEnum enumTaskStatus = default(Admin.NET.Application.TaskStatusEnum);
+
+ if(!Enum.TryParse<Admin.NET.Application.TaskStatusEnum>(_TaskStatus, out enumTaskStatus)&&!string.IsNullOrEmpty(_TaskStatus))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�乚{_TaskStatus}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.TaskStatus = enumTaskStatus;
+ }
+
+ }
+
+ if (string.IsNullOrEmpty(_TaskStatusName))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾浠诲姟鐘舵�佸悕绉癩{_TaskStatusName}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_TaskStatusName))
+ {
+ addItem.TaskStatusName = (string)(_TaskStatusName.Trim());
+ }
+ if(!string.IsNullOrEmpty(_TaskDescribe))
+ {
+ addItem.TaskDescribe = (string)(_TaskDescribe.Trim());
+ }
+ if(!string.IsNullOrEmpty(_TaskMsg))
+ {
+ addItem.TaskMsg = (string)(_TaskMsg.Trim());
+ }
+ if(!string.IsNullOrEmpty(_IssueTime))
+ {
+ addItem.IssueTime = Convert.ToDateTime(_IssueTime.Trim());
+ }
+ if(!string.IsNullOrEmpty(_FinishedTime))
+ {
+ addItem.FinishedTime = Convert.ToDateTime(_FinishedTime.Trim());
+ }
+
+ if (string.IsNullOrEmpty(_IsFlagFinish))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}涓嶈兘涓虹┖锛�");
+ }
+
+ if(!string.IsNullOrEmpty(_IsFlagFinish))
+ {
+ if(!_IsFlagFinish.Equals("鏄�") && !_IsFlagFinish.Equals("鍚�"))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁鏍囪寮哄埗瀹屾垚]{_IsFlagFinish}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ bool outIsFlagFinish = _IsFlagFinish.Equals("鏄�") ? true : false;
+ addItem.IsFlagFinish = outIsFlagFinish;
+ }
+ }
+
+ #endregion
+
details.Add(addItem);
}
@@ -383,7 +367,7 @@
await CheckExisitForImport(details);
return details;
}
-
+
/// <summary>
/// 鏍规嵁鐗堟湰涓嬭浇鏈哄櫒浜轰换鍔¤〃鐨凟xcel瀵煎叆妯℃澘
/// </summary>
@@ -397,7 +381,7 @@
var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鏈哄櫒浜轰换鍔¤〃).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
-
+
#endregion
#region 绉佹湁鏂规硶
@@ -440,72 +424,72 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskMsg), u => u.TaskMsg.Contains(input.TaskMsg.Trim()))
.WhereIF(input.IsFlagFinish.HasValue, u => u.IsFlagFinish == input.IsFlagFinish)
.Select<WmsRbLineTaskOutput>();
- if (input.IssueTimeRange != null && input.IssueTimeRange.Count > 0)
+ if(input.IssueTimeRange != null && input.IssueTimeRange.Count >0)
{
- DateTime? start = input.IssueTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.IssueTime > start);
- if (input.IssueTimeRange.Count > 1 && input.IssueTimeRange[1].HasValue)
+ DateTime? start= input.IssueTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.IssueTime >= start);
+ if (input.IssueTimeRange.Count >1 && input.IssueTimeRange[1].HasValue)
{
- var end = input.IssueTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.IssueTime < end);
+ var end = input.IssueTimeRange[1].Value;
+ query = query.Where(u => u.IssueTime <= end);
}
- }
- if (input.FinishedTimeRange != null && input.FinishedTimeRange.Count > 0)
+ }
+ if(input.FinishedTimeRange != null && input.FinishedTimeRange.Count >0)
{
- DateTime? start = input.FinishedTimeRange[0].Value.AddDays(-1);
- query = query.WhereIF(start.HasValue, u => u.FinishedTime > start);
- if (input.FinishedTimeRange.Count > 1 && input.FinishedTimeRange[1].HasValue)
+ DateTime? start= input.FinishedTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.FinishedTime >= start);
+ if (input.FinishedTimeRange.Count >1 && input.FinishedTimeRange[1].HasValue)
{
- var end = input.FinishedTimeRange[1].Value.AddDays(1);
- query = query.Where(u => u.FinishedTime < end);
+ var end = input.FinishedTimeRange[1].Value;
+ query = query.Where(u => u.FinishedTime <= end);
}
- }
+ }
return query;
- }
+ }
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist(WmsRbLineTask input, bool isEdit = false)
- {
-
-
-
- //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
-
-
- //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
- }
-
- /// <summary>
- /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
- {
- if (inputs?.Count <= 0)
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsRbLineTask input,bool isEdit=false)
{
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
}
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
- }
- #endregion
+ #endregion
}
diff --git "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index c22d136..3a5bb65 100644
--- "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\211\271\346\254\241\346\225\260\346\215\256\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\234\272\345\231\250\344\272\272\344\273\273\345\212\241\350\241\250\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\234\272\345\231\250\344\272\272\344\273\273\345\212\241\350\241\250\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 573b7e2..322be93 100644
--- "a/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\234\272\345\231\250\344\272\272\344\273\273\345\212\241\350\241\250\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/\346\234\272\345\231\250\344\272\272\344\273\273\345\212\241\350\241\250\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3