From 824a8449937515bf2ea9eff889e8dab454aa5be0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周五, 29 11月 2024 15:11:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs | 201 +++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs | 256 +++++++++
LA24030_LuLiPackageLine_Web/public/config.js | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs | 7
CC/iWareSql/WmsDBModel/mes_package_linequeue.cs | 20
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue | 316 ++++++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs | 100 +++
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.exe.config | 3
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs | 53 ++
CC/iWareSql/WmsDBModel/mes_package_gather.cs | 17
CC/iWareSql/WmsDBModel/mes_order_gather.cs | 45 +
/dev/null | 35 -
LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Order_Gather.ts | 78 +++
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs | 18
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs | 40 -
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs | 76 ++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 29 +
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 1
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 18
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue | 211 ++++++++
22 files changed, 1,415 insertions(+), 119 deletions(-)
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index 7a01456..fca626a 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -17,6 +17,7 @@
public virtual DbSet<GoViewPro> GoViewPro { get; set; }
public virtual DbSet<GoViewProData> GoViewProData { get; set; }
public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
+ public virtual DbSet<mes_order_gather> mes_order_gather { get; set; }
public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
new file mode 100644
index 0000000..907212b
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
@@ -0,0 +1,45 @@
+namespace iWareSql.WmsDBModel
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class mes_order_gather
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ public bool? IsKitting { get; set; }
+
+ public int PackageNum { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_gather.cs b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
index e032b15..d3a0f82 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
@@ -13,22 +13,24 @@
[Required]
[StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
public string PlanNo { get; set; }
[Required]
[StringLength(50)]
public string OrderId { get; set; }
- [StringLength(60)]
- public string Info5 { get; set; }
-
public int? AreaCode { get; set; }
public int UpiStatus { get; set; }
- [Required]
- [StringLength(50)]
- public string PackageCode { get; set; }
+ public bool? IsQiBao { get; set; }
public double? Info1 { get; set; }
@@ -50,9 +52,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
index d5d5455..209d581 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
@@ -13,22 +13,22 @@
[Required]
[StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
public string PlanNo { get; set; }
[Required]
[StringLength(50)]
public string OrderId { get; set; }
- [StringLength(60)]
- public string Info5 { get; set; }
-
public int? AreaCode { get; set; }
public int UpiStatus { get; set; }
-
- [Required]
- [StringLength(50)]
- public string PackageCode { get; set; }
public double? Info1 { get; set; }
@@ -50,9 +50,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
@@ -78,5 +75,8 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
index 4188c52..3c256f1 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
@@ -13,18 +13,18 @@
[Required]
[StringLength(50)]
- public string PlanNo { get; set; }
-
- [Required]
- [StringLength(50)]
- public string OrderId { get; set; }
+ public string PackageCode { get; set; }
[StringLength(60)]
public string Info5 { get; set; }
[Required]
[StringLength(50)]
- public string PackageCode { get; set; }
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
public double? Info1 { get; set; }
@@ -46,9 +46,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
@@ -77,5 +74,8 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index eb45ef9..a35a915 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -15,12 +15,6 @@
[StringLength(50)]
public string PackageCode { get; set; }
- public double? Info1 { get; set; }
-
- public double? Info2 { get; set; }
-
- public double? Info3 { get; set; }
-
public int PushStatus { get; set; }
public DateTime? PushTime { get; set; }
@@ -30,12 +24,6 @@
[Required]
[StringLength(50)]
public string ApiMessage { get; set; }
-
- public long? CreateOrgId { get; set; }
-
- [Required]
- [StringLength(64)]
- public string CreateOrgName { get; set; }
public DateTime? CreateTime { get; set; }
@@ -52,5 +40,11 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
}
}
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config"
index 27b3143..a3eedbb 100644
--- "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config"
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config"
@@ -17,7 +17,8 @@
<serviceBehaviors>
<behavior name="">
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
- <serviceDebug includeExceptionDetailInFaults="false" />
+ <!-- 鍚敤寮傚父璇︾粏淇℃伅鐨勭壒鎬� -->
+ <serviceDebug includeExceptionDetailInFaults="true" />
</behavior>
</serviceBehaviors>
</behaviors>
diff --git a/LA24030_LuLiPackageLine_Web/public/config.js b/LA24030_LuLiPackageLine_Web/public/config.js
index 086194f..e888e9b 100644
--- a/LA24030_LuLiPackageLine_Web/public/config.js
+++ b/LA24030_LuLiPackageLine_Web/public/config.js
@@ -4,6 +4,6 @@
"VITE_OPEN_CDN": "false",
"VITE_PUBLIC_PATH": "",
"VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
- //"VITE_API_URL": "http://localhost:5005"
- "VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
+ "VITE_API_URL": "http://localhost:5005"
+ //"VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Order_Gather.ts b/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Order_Gather.ts
new file mode 100644
index 0000000..fa5b087
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/mes_Order_Gather.ts
@@ -0,0 +1,78 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+ AddMes_Order_Gather = '/api/mes_Order_Gather/add',
+ DeleteMes_Order_Gather = '/api/mes_Order_Gather/delete',
+ UpdateMes_Order_Gather = '/api/mes_Order_Gather/update',
+ PageMes_Order_Gather = '/api/mes_Order_Gather/page',
+ ListMes_Order_Gather = '/api/mes_Order_Gather/list',
+ DetailMes_Order_Gather = '/api/mes_Order_Gather/detail',
+ ImportExcelMes_Order_Gather = '/api/mes_Order_Gather/importExcel',
+ DownloadExcelTemplateMes_Order_Gather = '/api/mes_Order_Gather/downloadExcelTemplate',
+}
+
+// 澧炲姞璁㈠崟鏁版嵁
+export const addMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.AddMes_Order_Gather,
+ method: 'post',
+ data: params
+ });
+
+// 鍒犻櫎璁㈠崟鏁版嵁
+export const deleteMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.DeleteMes_Order_Gather,
+ method: 'post',
+ data: params
+ });
+
+// 缂栬緫璁㈠崟鏁版嵁
+export const updateMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.UpdateMes_Order_Gather,
+ method: 'post',
+ data: params
+ });
+
+// 瀵煎叆璁㈠崟鏁版嵁
+export const importExcelMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.ImportExcelMes_Order_Gather,
+ method: 'post',
+ data: params
+ });
+
+// 涓嬭浇瀵煎叆璁㈠崟鏁版嵁妯℃澘
+export const downloadExcelTemplateMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.DownloadExcelTemplateMes_Order_Gather,
+ method: 'get',
+ data: params,
+ responseType: 'blob'
+ });
+
+
+// 鍒嗛〉鏌ヨ璁㈠崟鏁版嵁
+export const pageMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.PageMes_Order_Gather,
+ method: 'post',
+ data: params
+ });
+
+// 涓嶅垎椤垫煡璇㈣鍗曟暟鎹�
+export const listMes_Order_Gather = (params?: any) =>
+ request({
+ url: Api.ListMes_Order_Gather,
+ method: 'get',
+ data: params
+ });
+
+// 璇︽儏璁㈠崟鏁版嵁
+export const detailMes_Order_Gather = (id: any) =>
+ request({
+ url: Api.DetailMes_Order_Gather,
+ method: 'get',
+ data: { id }
+ });
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue
new file mode 100644
index 0000000..b70cd52
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue
@@ -0,0 +1,211 @@
+锘�<template>
+ <div class="mes_Order_Gather-container">
+ <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+ <template #header>
+ <div style="color: #fff">
+ <!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+ <span>{{ props.title }}</span>
+ </div>
+ </template>
+ <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules" v-loading="loading">
+ <el-row :gutter="35">
+ <el-form-item v-show="false">
+ <el-input v-model="ruleForm.id" />
+ </el-form-item>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鐢熶骇鍗曞彿" prop="info5">
+ <el-input v-model="ruleForm.info5" placeholder="璇疯緭鍏ョ敓浜у崟鍙�" maxlength="60" 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="planNo">
+ <el-input v-model="ruleForm.planNo" 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="orderId">
+ <el-input v-model="ruleForm.orderId" 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="isKitting">
+ <el-switch v-model="ruleForm.isKitting" 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="packageNum">
+ <el-input-number v-model="ruleForm.packageNum" placeholder="璇疯緭鍏ュ寘鏁�" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="宸蹭笅绾垮寘鏁�" prop="unLinePackageNum">
+ <el-input-number v-model="ruleForm.unLinePackageNum" placeholder="璇疯緭鍏ュ凡涓嬬嚎鍖呮暟" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏈笅绾垮寘鏁�" prop="noUnLinePackageNum">
+ <el-input-number v-model="ruleForm.noUnLinePackageNum" placeholder="璇疯緭鍏ユ湭涓嬬嚎鍖呮暟" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎬诲寘瑁呴潰绉�" prop="allPackageArea">
+ <el-input v-model="ruleForm.allPackageArea" placeholder="璇疯緭鍏ユ�诲寘瑁呴潰绉�" maxlength="18" 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="scanPackageArea">
+ <el-input v-model="ruleForm.scanPackageArea" placeholder="璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н" maxlength="18" 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="noScanPackageArea">
+ <el-input v-model="ruleForm.noScanPackageArea" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н" maxlength="18" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submit" :disabled="disabled_btn">纭� 瀹�</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+<style scoped>
+:deep(.el-select),
+:deep(.el-input-number) {
+ width: 100%;
+}
+</style>
+<script lang="ts" setup>
+ import { ref,onMounted } from "vue";
+ import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+ import { ElMessage } from "element-plus";
+ import type { FormRules } from "element-plus";
+ import { addMes_Order_Gather, updateMes_Order_Gather, detailMes_Order_Gather } from "/@/api/main/WmsOrder/mes_Order_Gather";
+
+ //鐖剁骇浼犻�掓潵鐨勫弬鏁�
+ 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>({
+ planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
+ orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
+ packageNum: [{required: true, message: '璇疯緭鍏ュ寘鏁帮紒', trigger: 'blur',},],
+ unLinePackageNum: [{required: true, message: '璇疯緭鍏ュ凡涓嬬嚎鍖呮暟锛�', trigger: 'blur',},],
+ noUnLinePackageNum: [{required: true, message: '璇疯緭鍏ユ湭涓嬬嚎鍖呮暟锛�', trigger: 'blur',},],
+ allPackageArea: [{required: true, message: '璇疯緭鍏ユ�诲寘瑁呴潰绉紒', trigger: 'blur',},],
+ scanPackageArea: [{required: true, message: '璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н锛�', trigger: 'blur',},],
+ noScanPackageArea: [{required: true, message: '璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н锛�', trigger: 'blur',},],
+ isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
+ });
+
+ /*
+ * 鎵撳紑寮圭獥
+ * @param flag 鏍囪锛�1鏂板 2缂栬緫 3鏌ョ湅锛�
+ * @param row 琛屾暟鎹�
+ */
+ const openDialog = async (flag: number,row: any) => {
+ // ruleForm.value = JSON.parse(JSON.stringify(row));
+ // 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
+ let rowData = JSON.parse(JSON.stringify(row));
+ if (rowData.id)
+ ruleForm.value = (await detailMes_Order_Gather(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 addMes_Order_Gather(values);
+ } else {
+ title='缂栬緫';
+ ret = await updateMes_Order_Gather(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 () => {
+ });
+
+ //灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+ defineExpose({ openDialog });
+</script>
+
+
+
+
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
new file mode 100644
index 0000000..3824935
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
@@ -0,0 +1,316 @@
+锘�<template>
+ <div class="mes_Order_Gather-container">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <el-form :model="queryParamsMes_Order_Gather" 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="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,鍒涘缓浜�,淇敼浜�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鐢熶骇鍗曞彿">
+ <el-input v-model="queryParamsMes_Order_Gather.info5" clearable="" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鎵规鍙�">
+ <el-input v-model="queryParamsMes_Order_Gather.planNo" clearable="" placeholder="璇疯緭鍏ユ壒娆″彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="璁㈠崟鍙�">
+ <el-input v-model="queryParamsMes_Order_Gather.orderId" clearable="" placeholder="璇疯緭鍏ヨ鍗曞彿"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鏄惁榻愬">
+ <el-select clearable="" v-model="queryParamsMes_Order_Gather.isKitting" placeholder="璇烽�夋嫨鏄惁榻愬">
+ <el-option v-for="(item,index) in getEnumIsKittingData_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_Order_Gather">
+ <el-form-item label="鍖呮暟">
+ <el-input-number v-model="queryParamsMes_Order_Gather.packageNum" clearable="" placeholder="璇疯緭鍏ュ寘鏁�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="宸蹭笅绾垮寘鏁�">
+ <el-input-number v-model="queryParamsMes_Order_Gather.unLinePackageNum" clearable="" placeholder="璇疯緭鍏ュ凡涓嬬嚎鍖呮暟"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鏈笅绾垮寘鏁�">
+ <el-input-number v-model="queryParamsMes_Order_Gather.noUnLinePackageNum" clearable="" placeholder="璇疯緭鍏ユ湭涓嬬嚎鍖呮暟"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鎬诲寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.allPackageArea" clearable="" placeholder="璇疯緭鍏ユ�诲寘瑁呴潰绉�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="宸叉壂鎻忓寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.scanPackageArea" clearable="" placeholder="璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鏈壂鎻忓寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.noScanPackageArea" clearable="" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.createTimeRange" />
+
+ </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="handleQueryMes_Order_Gather" v-auth="'mes_Order_Gather:page'" :disabled="disabled_btnMes_Order_Gather"> 鏌ヨ </el-button>
+ <el-button icon="ele-Refresh" @click="resetMes_Order_Gather"> 閲嶇疆 </el-button>
+ <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUIMes_Order_Gather" v-if="!showAdvanceQueryUIMes_Order_Gather" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+ <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUIMes_Order_Gather" v-if="showAdvanceQueryUIMes_Order_Gather" style="margin-left:5px;"> 闅愯棌 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddMes_Order_Gather" v-auth="'mes_Order_Gather:add'"> 鏂板 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handleExportExcelMes_Order_Gather" v-auth="'mes_Order_Gather:exportExcel'" > 瀵煎嚭 </el-button>
+ </el-button-group>
+ </el-form-item>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
+ <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+ <el-table
+ ref="tableRefMes_Order_Gather"
+ :data="tableDataMes_Order_Gather"
+ style="width: 100%"
+ v-loading="loadingMes_Order_Gather"
+ tooltip-effect="light"
+ row-key="id"
+ @sort-change="sortChangeMes_Order_Gather"
+ border="">
+ <el-table-column type="index" label="搴忓彿" width="55" align="center"/>
+ <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="" />
+ <el-table-column prop="isKitting" label="鏄惁榻愬" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isKitting"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
+ <el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="allPackageArea" label="鎬诲寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="scanPackageArea" label="宸叉壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="noScanPackageArea" label="鏈壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
+ <el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
+ <el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Order_Gather:update') || auth('mes_Order_Gather:delete')">
+ <template #default="scope">
+ <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Order_Gather(scope.row)" v-auth="'mes_Order_Gather:update'"> 缂栬緫 </el-button>
+ <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delMes_Order_Gather(scope.row)" v-auth="'mes_Order_Gather:delete'"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ v-model:currentPage="tableParamsMes_Order_Gather.page"
+ v-model:page-size="tableParamsMes_Order_Gather.pageSize"
+ :total="tableParamsMes_Order_Gather.total"
+ :page-sizes="[10, 20, 50, 100, 200, 500]"
+ small=""
+ background=""
+ @size-change="handleSizeChangeMes_Order_Gather"
+ @current-change="handleCurrentChangeMes_Order_Gather"
+ layout="total, sizes, prev, pager, next, jumper"
+ />
+ <printDialogMes_Order_Gather
+ ref="printDialogRefMes_Order_Gather"
+ :title="printMes_Order_GatherTitle"
+ @reloadTable="handleQueryMes_Order_Gather" />
+ <editDialogMes_Order_Gather
+ ref="editDialogRefMes_Order_Gather"
+ :title="editMes_Order_GatherTitle"
+ @reloadTable="handleQueryMes_Order_Gather"
+ />
+ </el-card>
+ </div>
+</template>
+
+<script lang="ts" setup="" name="mes_Order_Gather">
+ import { ref,onMounted } from "vue";
+ import { ElMessageBox, ElMessage } from "element-plus";
+ import { auth } from '/@/utils/authFunction';
+ import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+ import { formatDate,formatDate_T_Date,formatDate_T_Time,defaultTimeRange } from '/@/utils/formatTime';
+ import { exportPageExcel } from '/@/utils/exportPageExcel' //寮曞叆瀵煎嚭鏂规硶
+
+
+ import printDialogMes_Order_Gather from '/@/views/system/print/component/hiprint/preview.vue'
+ import editDialogMes_Order_Gather from '/@/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue'
+ import { pageMes_Order_Gather, deleteMes_Order_Gather,importExcelMes_Order_Gather,downloadExcelTemplateMes_Order_Gather } from '/@/api/main/WmsOrder/mes_Order_Gather';
+ import { getAPI } from '/@/utils/axios-utils';
+ import { SysEnumApi } from '/@/api-services/api';
+ import commonFunction from '/@/utils/commonFunction';
+
+ const getEnumIsKittingData_Index = ref<any>([]);
+
+
+ /***************************************************[璁㈠崟鏁版嵁鎿嶄綔]寮�濮�***************************************************/
+ const showAdvanceQueryUIMes_Order_Gather = ref(false);
+ const tableRefMes_Order_Gather = ref(null);
+ const printDialogRefMes_Order_Gather = ref();
+ const editDialogRefMes_Order_Gather = ref();
+ const loadingMes_Order_Gather = ref(false);
+ const disabled_btnMes_Order_Gather = ref(false);
+ const tableDataMes_Order_Gather = ref<any>([]);
+ const queryParamsMes_Order_Gather = ref<any>({});
+ const tableParamsMes_Order_Gather = ref({
+ page: 1,
+ pageSize: 10,
+ total: 0,
+ });
+
+ const printMes_Order_GatherTitle = ref("");
+ const editMes_Order_GatherTitle = ref("");
+
+ // 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
+ const changeAdvanceQueryUIMes_Order_Gather = () => {
+ showAdvanceQueryUIMes_Order_Gather.value = !showAdvanceQueryUIMes_Order_Gather.value;
+ }
+
+ // 鏌ヨ璁㈠崟鏁版嵁
+ const handleQueryMes_Order_Gather = async () => {
+ loadingMes_Order_Gather.value = true;
+ disabled_btnMes_Order_Gather.value = true;
+ var res = await pageMes_Order_Gather(Object.assign(queryParamsMes_Order_Gather.value, tableParamsMes_Order_Gather.value));
+ if(res.data.type=="success"){
+ tableDataMes_Order_Gather.value = res.data.result?.items ?? [];
+ tableParamsMes_Order_Gather.value.total = res.data.result?.total;
+ }
+ loadingMes_Order_Gather.value = false;
+ disabled_btnMes_Order_Gather.value = false;
+ };
+
+ // 閲嶇疆璁㈠崟鏁版嵁鏌ヨ
+ const resetMes_Order_Gather = async () => {
+ queryParamsMes_Order_Gather.value = {}
+ };
+
+ // 璁㈠崟鏁版嵁鍒楁帓搴�
+ const sortChangeMes_Order_Gather = async (column: any) => {
+ queryParamsMes_Order_Gather.value.field = column.prop;
+ queryParamsMes_Order_Gather.value.order = column.order;
+ await handleQueryMes_Order_Gather();
+ };
+
+ // 鎵撳紑鏂板璁㈠崟鏁版嵁椤甸潰
+ const openAddMes_Order_Gather = () => {
+ editMes_Order_GatherTitle.value = '娣诲姞璁㈠崟鏁版嵁';
+ editDialogRefMes_Order_Gather.value.openDialog(1,{});
+ };
+
+ // 鎵撳紑鎵撳嵃璁㈠崟鏁版嵁椤甸潰
+ const openPrintMes_Order_Gather = async (row: any) => {
+ printMes_Order_GatherTitle.value = '鎵撳嵃璁㈠崟鏁版嵁';
+ }
+
+ // 鎵撳紑缂栬緫璁㈠崟鏁版嵁椤甸潰
+ const openEditMes_Order_Gather = (row: any) => {
+ editMes_Order_GatherTitle.value = '缂栬緫璁㈠崟鏁版嵁';
+ editDialogRefMes_Order_Gather.value.openDialog(2,row);
+ };
+
+ // 鍒犻櫎璁㈠崟鏁版嵁
+ const delMes_Order_Gather = (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ loadingMes_Order_Gather.value = true;
+ var ret = await deleteMes_Order_Gather(row);
+ if(ret.data.type=="success"){
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ }
+ loadingMes_Order_Gather.value = false;
+ handleQueryMes_Order_Gather();
+ })
+ .catch(() => {});
+ };
+
+ // 鏀瑰彉璁㈠崟鏁版嵁椤甸潰瀹归噺
+ const handleSizeChangeMes_Order_Gather = (val: number) => {
+ tableParamsMes_Order_Gather.value.pageSize = val;
+ handleQueryMes_Order_Gather();
+ };
+
+ // 鏀瑰彉璁㈠崟鏁版嵁椤电爜搴忓彿
+ const handleCurrentChangeMes_Order_Gather = (val: number) => {
+ tableParamsMes_Order_Gather.value.page = val;
+ handleQueryMes_Order_Gather();
+ };
+
+/***************************************************[璁㈠崟鏁版嵁鎿嶄綔]缁撴潫***************************************************/
+/***************************************************[璁㈠崟鏁版嵁瀵煎嚭]寮�濮�***************************************************/
+//瀹氫箟褰撳墠椤甸潰鐨勬柟娉曠粍
+const functionMapMes_Order_Gather = {
+ getEnumIsKittingData_Index,
+ formatDate_T_Date,
+ formatDate_T_Time
+};
+//鐐瑰嚮瀵煎嚭鎸夐挳
+const handleExportExcelMes_Order_Gather = async (formData:Blob) => {
+ loadingMes_Order_Gather.value = true;
+ disabled_btnMes_Order_Gather.value = true;
+ var new_tableParamsMes_Order_Gather=JSON.parse(JSON.stringify(tableParamsMes_Order_Gather.value));
+ new_tableParamsMes_Order_Gather.page = 1;
+ new_tableParamsMes_Order_Gather.pageSize = 100000;
+ var res = await pageMes_Order_Gather(Object.assign(queryParamsMes_Order_Gather.value, new_tableParamsMes_Order_Gather));
+ if(res.data.type=="success"){
+ exportExcelMes_Order_Gather(res.data.result?.items ?? []);
+ }
+ loadingMes_Order_Gather.value = false;
+ disabled_btnMes_Order_Gather.value = false;
+};
+//瀵煎嚭
+const exportExcelMes_Order_Gather = async (exportDataList:Array) => {
+ exportPageExcel(exportDataList, tableRefMes_Order_Gather,"璁㈠崟鏁版嵁",functionMapMes_Order_Gather);
+};
+/***************************************************[璁㈠崟鏁版嵁瀵煎嚭]缁撴潫***************************************************/
+ // 璁㈠崟鏁版嵁椤甸潰鍔犺浇鏃�
+ onMounted(async () => {
+ getEnumIsKittingData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
+ });
+
+ handleQueryMes_Order_Gather();
+</script>
+<style scoped>
+:deep(.el-input),
+:deep(.el-select),
+:deep(.el-input-number) {
+ width: 100%;
+}
+</style>
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs
new file mode 100644
index 0000000..c5f728e
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs
@@ -0,0 +1,76 @@
+锘縰sing Admin.NET.Core;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/5/29涓婂崍10:26:39
+ * @desc : 璋冨害浠诲姟
+ */
+namespace Admin.NET.Application.Entity
+{
+ /// <summary>
+ /// 璁㈠崟姹囨�绘暟鎹�
+ /// </summary>
+ [SugarTable("mes_order_gather", "璁㈠崟姹囨�绘暟鎹�")]
+ public class Mes_Order_Gather : EntityBase
+ {
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ public string OrderId { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁榻愬
+ /// </summary>
+ [SugarColumn(ColumnName = "IsKitting", ColumnDescription = "鏄惁榻愬")]
+ public bool? IsKitting { get; set; }
+
+ /// <summary>
+ /// 鍖呮暟
+ /// </summary>
+ [SugarColumn(ColumnName = "PackageNum", ColumnDescription = "鍖呮暟")]
+ public int PackageNum { get; set; }
+
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "UnLinePackageNum", ColumnDescription = "宸蹭笅绾垮寘鏁�")]
+ public int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "NoUnLinePackageNum", ColumnDescription = "鏈笅绾垮寘鏁�")]
+ public int NoUnLinePackageNum { get; set; }
+
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "AllPackageArea", ColumnDescription = "鎬诲寘瑁呴潰绉�")]
+ public decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ScanPackageArea", ColumnDescription = "宸叉壂鎻忓寘瑁呴潰绉�")]
+ public decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "NoScanPackageArea", ColumnDescription = "鏈壂鎻忓寘瑁呴潰绉�")]
+ public decimal NoScanPackageArea { get; set; }
+
+ }
+}
\ No newline at end of file
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 3b7b94e..f6c5d16 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
@@ -51,6 +51,13 @@
[SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
+
+ /// <summary>
+ /// 鏄惁榻愬寘
+ /// </summary>
+ [SugarColumn(ColumnName = "IsQiBao", ColumnDescription = "鏄惁榻愬寘")]
+ public bool? IsQiBao { get; set; }
+
#endregion
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/DispenseStatusEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/DispenseStatusEnum.cs
deleted file mode 100644
index 7683dd0..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/DispenseStatusEnum.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-锘�
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Application;
-/// <summary>
-/// 鍒嗛厤鐘舵��
-/// </summary>
-[Description("鍒嗛厤鐘舵��")]
-public enum DispenseStatusEnum
-{
-
- /// <summary>
- /// 鏈垎閰�
- /// </summary>
- [Description("鏈垎閰�")]
- 鏈垎閰� = 1,
-
- /// <summary>
- /// 澶勭悊涓�
- /// </summary>
- [Description("宸插垎閰�")]
- InExecution = 2,
- /// <summary>
- /// 宸插彇娑�
- /// </summary>
- [Description("宸插彇娑�")]
- 宸插彇娑� = 3,
-
-
-
-
-}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/FinancialTypeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/FinancialTypeEnum.cs
deleted file mode 100644
index d64d2f1..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/FinancialTypeEnum.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-锘�
-
-namespace Admin.NET.Application;
-
-/// <summary>
-/// 璐㈠姟绫诲瀷
-/// </summary>
-[Description("璐㈠姟绫诲瀷")]
-public enum FinancialTypeEnum
-{
- /// <summary>
- /// 娴嬭瘯绫诲瀷
- /// </summary>
- [Description("娴嬭瘯绫诲瀷")]
- 娴嬭瘯绫诲瀷 = 0,
-
-
-
-}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/OrderStatusEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/OrderStatusEnum.cs
deleted file mode 100644
index 1e48fc8..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/OrderStatusEnum.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-锘�
-using System.ComponentModel;
-namespace Admin.NET.Application
-{
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [Description("鍗曟嵁鐘舵��")]
- public enum OrderStatusEnum
- {
-
- /// <summary>
- /// 鏂板缓
- /// </summary>
- [Description("鏂板缓")]
- 鏂板缓 = 0,
-
- /// <summary>
- /// 澶勭悊涓�
- /// </summary>
- [Description("澶勭悊涓�")]
- 澶勭悊涓� = 1,
-
- /// <summary>
- /// 宸插畬鎴�
- /// </summary>
- [Description("宸插畬鎴�")]
- 宸插畬鎴� = 2,
-
- /// <summary>
- /// 宸插彇娑�
- /// </summary>
- [Description("宸插彇娑�")]
- 宸插彇娑� = 3,
-
- /// <summary>
- /// 宸插叧闂�
- /// </summary>
- [Description("宸插叧闂�")]
- 宸插叧闂� = 4
-
-
-
- }
-}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordStatusEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordStatusEnum.cs
deleted file mode 100644
index 0a04e78..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordStatusEnum.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-锘�
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Application;
-/// <summary>
-/// 鍒嗛厤鐘舵��
-/// </summary>
-[Description("鍒嗛厤鐘舵��")]
-public enum PDRecordStatusEnum
-{
-
- ///// <summary>
- ///// 宸查閰�
- ///// </summary>
- //[Description("宸查閰�")]
- //宸查閰� = 1,
-
- /// <summary>
- /// 宸插垎閰�
- /// </summary>
- [Description("宸插垎閰�")]
- 宸插垎閰� = 2,
-
- ///// <summary>
- ///// 宸蹭笅鍙�
- ///// </summary>
- //[Description("宸蹭笅鍙�")]
- //宸蹭笅鍙� = 3,
- /// <summary>
- /// 宸插彇娑�
- /// </summary>
- [Description("宸插彇娑�")]
- 宸插彇娑� = 4,
-
-
-
-
-}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordTypeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordTypeEnum.cs
deleted file mode 100644
index 98408c2..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/PDRecordTypeEnum.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Application;
-/// <summary>
-/// 棰勫垎閰嶈褰曠被鍨�
-/// </summary>
-[Description("棰勫垎閰嶈褰曠被鍨�")]
-public enum PDRecordTypeEnum
-{
-
- /// <summary>
- /// 鍒嗛厤
- /// </summary>
- [Description("鍒嗛厤")]
- 鍒嗛厤 = 1,
-
- /// <summary>
- /// 棰勯厤
- /// </summary>
- [Description("棰勯厤")]
- 棰勯厤 =2
-
-
-
-}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
index b7f323f..5d69793 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
@@ -45,6 +45,10 @@
throw Oops.Oh("鏈鏈夐噸澶嶇殑UPI锛侀噸澶嶅彿涓�:" + dit.Key + ",閲嶅鏉℃暟:" + dit.Value);
}
+ //鍚屼竴涓猆PI鍙兘灞炰簬涓�涓� 鎵规鍙�+璁㈠崟鍙�
+ //浼氬瓨鍦� 涓�涓壒娆″彿锛屽涓鍗曞彿鐨勬儏鍐�
+ //浼氬瓨鍦� 涓�涓鍗曞彿锛屽涓壒娆″彿鐨勬儏鍐�
+
//鎸夌収鎵规鍙�+璁㈠崟鍙峰垹闄�
List<string> packageList = new List<string>();
input.ForEach(x => packageList.Add(x.PlanNo + "_" + x.OrderId));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
new file mode 100644
index 0000000..ee955e5
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
@@ -0,0 +1,256 @@
+锘縰sing Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application;
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁鍩虹杈撳叆鍙傛暟
+ /// </summary>
+ public class Mes_Order_GatherBaseInput
+ {
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public virtual string Info5 { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public virtual string PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public virtual string OrderId { get; set; }
+
+ /// <summary>
+ /// 鏄惁榻愬
+ /// </summary>
+ public virtual bool? IsKitting { get; set; }
+
+ /// <summary>
+ /// 鍖呮暟
+ /// </summary>
+ public virtual int PackageNum { get; set; }
+
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public virtual int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public virtual int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public virtual DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒d
+ /// </summary>
+ public virtual long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒d
+ /// </summary>
+ public virtual long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public virtual bool IsDelete { get; set; }
+
+ }
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+ /// </summary>
+ public class Mes_Order_GatherInput : BasePageInput
+ {
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public string? Info5 { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string? PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public string? OrderId { get; set; }
+
+ /// <summary>
+ /// 鏄惁榻愬
+ /// </summary>
+ public bool? IsKitting { get; set; }
+
+ /// <summary>
+ /// 鍖呮暟
+ /// </summary>
+ public int? PackageNum { get; set; }
+
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public int? UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public int? NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public decimal? AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal? ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal? NoScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> CreateTimeRange { get; set; }
+ }
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁澧炲姞杈撳叆鍙傛暟
+ /// </summary>
+ public class AddMes_Order_GatherInput : Mes_Order_GatherBaseInput
+ {
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [Required(ErrorMessage = "鎵规鍙蜂笉鑳戒负绌�")]
+ public override string PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ [Required(ErrorMessage = "璁㈠崟鍙蜂笉鑳戒负绌�")]
+ public override string OrderId { get; set; }
+
+ /// <summary>
+ /// 鍖呮暟
+ /// </summary>
+ [Required(ErrorMessage = "鍖呮暟涓嶈兘涓虹┖")]
+ public override int PackageNum { get; set; }
+
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ [Required(ErrorMessage = "宸蹭笅绾垮寘鏁颁笉鑳戒负绌�")]
+ public override int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ [Required(ErrorMessage = "鏈笅绾垮寘鏁颁笉鑳戒负绌�")]
+ public override int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "鎬诲寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "宸叉壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "鏈壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
+ public override bool IsDelete { get; set; }
+
+ }
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁鍒犻櫎杈撳叆鍙傛暟
+ /// </summary>
+ public class DeleteMes_Order_GatherInput : BaseIdInput
+ {
+ }
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁鏇存柊杈撳叆鍙傛暟
+ /// </summary>
+ public class UpdateMes_Order_GatherInput : AddMes_Order_GatherInput
+ {
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+ }
+
+ /// <summary>
+ /// 璁㈠崟鏁版嵁涓婚敭鏌ヨ杈撳叆鍙傛暟
+ /// </summary>
+ public class QueryByIdMes_Order_GatherInput : DeleteMes_Order_GatherInput
+ {
+
+ }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs
new file mode 100644
index 0000000..8766f3b
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs
@@ -0,0 +1,100 @@
+锘縩amespace Admin.NET.Application;
+
+/// <summary>
+/// 璁㈠崟鏁版嵁杈撳嚭鍙傛暟
+/// </summary>
+public class Mes_Order_GatherOutput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ public long? Id { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public string Info5 { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string PlanNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// 鏄惁榻愬
+ /// </summary>
+ public bool? IsKitting { get; set; }
+
+ /// <summary>
+ /// 鍖呮暟
+ /// </summary>
+ public int PackageNum { get; set; }
+
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜篒d
+ /// </summary>
+ public long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜篒d
+ /// </summary>
+ public long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public bool IsDelete { get; set; }
+
+ }
+
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
new file mode 100644
index 0000000..f5b22c7
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
@@ -0,0 +1,201 @@
+锘縰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 Mes_Order_GatherService : IDynamicApiController, ITransient
+{
+ private readonly SqlSugarRepository<Mes_Order_Gather> _rep;
+ public Mes_Order_GatherService(SqlSugarRepository<Mes_Order_Gather> rep)
+ {
+ _rep = rep;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ璁㈠崟鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Page")]
+ [Description("Mes_Order_Gather/Page")]
+ public async Task<SqlSugarPagedList<Mes_Order_GatherOutput>> Page(Mes_Order_GatherInput 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("Mes_Order_Gather/List")]
+ public async Task<List<Mes_Order_GatherOutput>> List([FromQuery] Mes_Order_GatherInput input)
+ {
+ var query = CommonPageFilter(input);
+ return await query.OrderBuilder(input, "", "Id").Select<Mes_Order_GatherOutput>().ToListAsync();
+ }
+
+ /// <summary>
+ /// 澧炲姞璁㈠崟鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Add")]
+ [Description("Mes_Order_Gather/Add")]
+ public async Task<long> Add(AddMes_Order_GatherInput input)
+ {
+ var entity = input.Adapt<Mes_Order_Gather>();
+
+ //閲嶅鎬ч獙璇�
+ await CheckExist(entity);
+
+ await _rep.InsertAsync(entity);
+ return entity.Id;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎璁㈠崟鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Delete")]
+ [Description("Mes_Order_Gather/Delete")]
+ public async Task Delete(DeleteMes_Order_GatherInput 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("Mes_Order_Gather/Update")]
+ public async Task Update(UpdateMes_Order_GatherInput input)
+ {
+ var entity = input.Adapt<Mes_Order_Gather>();
+
+ //閲嶅鎬ч獙璇�
+ 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("Mes_Order_Gather/Detail")]
+ public async Task<Mes_Order_Gather> Detail([FromQuery] QueryByIdMes_Order_GatherInput input)
+ {
+ return await _rep.GetFirstAsync(u => u.Id == input.Id);
+ }
+
+
+
+
+
+
+ #region 绉佹湁鏂规硶
+
+ /// <summary>
+ /// 鍏叡鏌ヨ璁㈠崟鏁版嵁鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ private ISugarQueryable<Mes_Order_GatherOutput> CommonPageFilter(Mes_Order_GatherInput input)
+ {
+ var query = _rep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
+ u.Info5.Contains(input.SearchKey.Trim())
+ || u.PlanNo.Contains(input.SearchKey.Trim())
+ || u.OrderId.Contains(input.SearchKey.Trim())
+ || u.CreateUserName.Contains(input.SearchKey.Trim())
+ || u.UpdateUserName.Contains(input.SearchKey.Trim())
+ )
+ .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()))
+ .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
+ .WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
+ .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
+ .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
+ .Select<Mes_Order_GatherOutput>();
+ if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+ {
+ DateTime? start= input.CreateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+ if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
+ {
+ var end = input.CreateTimeRange[1].Value;
+ query = query.Where(u => u.CreateTime <= end);
+ }
+ }
+ return query;
+ }
+
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( Mes_Order_Gather input,bool isEdit=false)
+ {
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<Mes_Order_Gather> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+ }
+ #endregion
+
+}
+
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs
index 459bb37..f32dcb5 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs
@@ -427,43 +427,3 @@
}
-/// <summary>
-/// 搴撳瓨淇℃伅鍒嗛〉鏌ヨ杈撳叆鍙傛暟
-/// </summary>
-public class KittingListInput : BasePageInput
-{
- /// <summary>
- /// 鍏抽敭瀛楁煡璇�
- /// </summary>
- public string? SearchKey { get; set; }
-
- /// <summary>
- /// 鏄惁榻愬
- /// </summary>
- public bool? IsKitting { get; set; }
-
- /// <summary>
- /// 杩涘叆鏃堕棿
- /// </summary>
- public DateTime? InTime { get; set; }
-
- /// <summary>
- /// 杩涘叆鏃堕棿鑼冨洿
- /// </summary>
- public List<DateTime?> InTimeRange { get; set; }
- /// <summary>
- /// 閮ㄤ欢鏉＄爜
- /// </summary>
- public string? UPI { get; set; }
-
- /// <summary>
- /// 閮ㄤ欢鍚嶇О
- /// </summary>
- public string? DetailName { get; set; }
-
- /// <summary>
- /// 鎵规
- /// </summary>
- public string? PlanNo { get; set; }
- public string PackageCode { get; set; }
-}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index 552d54a..a03800a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -5,6 +5,8 @@
using System.Web;
using System.Text;
using System;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+
namespace Admin.NET.Application;
/// <summary>
/// 搴撳瓨淇℃伅鏈嶅姟
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index 2898f86..6ce3158 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -6,6 +6,7 @@
using System.Text;
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
namespace Admin.NET.Application;
/// <summary>
@@ -19,10 +20,13 @@
private readonly SqlSugarRepository<Mes_Package_Gather> _mesPackageGatherRep;
private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
+ private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
+
public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
, SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
, SqlSugarRepository<SysConfig> sysConfigRep
, SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
+ , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
)
{
_sysConfigRep = sysConfigRep;
@@ -30,6 +34,7 @@
_rep = rep;
_wmsStockQuanRep = wmsStockQuanRep;
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
+ _mesOrderGatherRep = mesOrderGatherRep;
}
@@ -114,7 +119,7 @@
{
throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
}
- if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value!="鏃�")
+ if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "鏃�")
{
throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
}
@@ -159,5 +164,27 @@
}
return singlePackage;
}
+
+
+ /// <summary>
+ /// 鏌ヨ涓嶉綈濂楀崟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryNoKittingList")]
+ [Description("WmsOperationTask/QueryNoKittingList")]
+ public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
+ {
+ var list = await _mesOrderGatherRep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
+ .Where(x => x.IsKitting == false)
+ .OrderBy(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+ return list; // 缁撴灉
+ }
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs
new file mode 100644
index 0000000..857d940
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/Dto/KittingListInput.cs
@@ -0,0 +1,53 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+/// <summary>
+/// 搴撳瓨淇℃伅鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class KittingListInput : BasePageInput
+{
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ public string? Info5 { get; set; }
+
+ /// <summary>
+ /// 鏄惁榻愬
+ /// </summary>
+ public bool? IsKitting { get; set; }
+
+ /// <summary>
+ /// 杩涘叆鏃堕棿
+ /// </summary>
+ public DateTime? InTime { get; set; }
+
+ /// <summary>
+ /// 杩涘叆鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> InTimeRange { get; set; }
+ /// <summary>
+ /// 閮ㄤ欢鏉＄爜
+ /// </summary>
+ public string? UPI { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢鍚嶇О
+ /// </summary>
+ public string? DetailName { get; set; }
+
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ public string? PlanNo { get; set; }
+ public string PackageCode { get; set; }
+}
+
--
Gitblit v1.9.3