From 88215726317c5f095b61c8d5306411e895cb0775 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周六, 30 11月 2024 13:17:51 +0800 Subject: [PATCH] 222 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 32 +++++++++- CC/iWareSql/WmsDBModel/mes_order_gather.cs | 4 + LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs | 12 ++++ LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs | 24 ++++++++ LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs | 11 +++ LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue | 16 +++++ LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs | 10 +++ LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs | 12 ++++ CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 3 + LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue | 14 ++++ 10 files changed, 133 insertions(+), 5 deletions(-) diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" index 24e07d7..07a6e5a 100644 --- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" +++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" @@ -55,6 +55,7 @@ var configValues = configValue.Split('|'); var packageCode = configValues[0]; var qitaoValue = configValues[1];//榻愬 涓嶉綈濂� + var _UnlinePerson = configValues[2]; bool iscomplete = false; if (qitaoValue.Equals("榻愬")) { @@ -144,6 +145,8 @@ if (order.PackageNum == order.UnLinePackageNum) { order.IsUnline = true; + order.UnlineTime = DateTime.Now; + order.UnlinePerson = _UnlinePerson; } else { diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs index bf3c59b..280d1ce 100644 --- a/CC/iWareSql/WmsDBModel/mes_order_gather.cs +++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs @@ -26,6 +26,10 @@ public bool? IsUnline { get; set; } + public DateTime? UnlineTime { get; set; } + + public string? UnlinePerson { get; set; } + public int PackageNum { get; set; } public int UnLinePackageNum { get; set; } 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 index fb5858b..cdc06ac 100644 --- 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 @@ -48,6 +48,20 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> + <el-form-item label="涓嬬嚎鏃堕棿" prop="unlineTime"> + <el-date-picker v-model="ruleForm.unlineTime" type="date" placeholder="涓嬬嚎鏃堕棿" /> + + </el-form-item> + + </el-col> + <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> + <el-form-item label="涓嬬嚎浜�" prop="unlinePerson"> + <el-input v-model="ruleForm.unlinePerson" 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="packageNum"> <el-input-number v-model="ruleForm.packageNum" placeholder="璇疯緭鍏ュ寘鏁�" clearable /> 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 index 12069b7..66c4ede 100644 --- 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 @@ -5,7 +5,7 @@ <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-input v-model="queryParamsMes_Order_Gather.searchKey" clearable="" placeholder="鐢熶骇鍗曞彿,鎵规鍙�,璁㈠崟鍙�,涓嬬嚎浜�,鍒涘缓浜�,淇敼浜�"/> </el-form-item> </el-col> @@ -42,6 +42,18 @@ <el-option v-for="(item,index) in getEnumIsUnlineData_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-date-picker placeholder="璇烽�夋嫨涓嬬嚎鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMes_Order_Gather.unlineTimeRange" /> + + </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.unlinePerson" clearable="" placeholder="璇疯緭鍏ヤ笅绾夸汉"/> </el-form-item> </el-col> @@ -127,6 +139,8 @@ </template> </el-table-column> + <el-table-column prop="unlineTime" label="涓嬬嚎鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" /> + <el-table-column prop="unlinePerson" label="涓嬬嚎浜�" show-overflow-tooltip="" /> <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="" /> 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 index 3c4af4d..bd5c6de 100644 --- 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 @@ -42,6 +42,18 @@ [SugarColumn(ColumnName = "IsUnline", ColumnDescription = "鏄惁涓嬬嚎")] public bool? IsUnline { get; set; } + /// <summary> + /// 涓嬬嚎鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "UnlineTime", ColumnDescription = "涓嬬嚎鏃堕棿")] + public DateTime? UnlineTime { get; set; } + + /// <summary> + /// 涓嬬嚎浜� + /// </summary> + [SugarColumn(ColumnName = "UnlinePerson", ColumnDescription = "涓嬬嚎浜�", Length = 50)] + public string? UnlinePerson { get; set; } + /// <summary> /// 鍖呮暟 diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs index f4a625a..9554f49 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs @@ -7,6 +7,7 @@ using DocumentFormat.OpenXml.Office.CustomUI; using Microsoft.CodeAnalysis.Operations; using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto; +using Furion.DatabaseAccessor; namespace Admin.NET.Application; /// <summary> @@ -21,6 +22,7 @@ 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 @@ -85,6 +87,7 @@ [HttpPost] [ApiDescriptionSettings(Name = "ValdateQiTao")] [Description("WmsOperationTask/ValdateQiTao")] + [UnitOfWork] public async Task<ValidateQiTaoOutput> ValdateQiTao(ValidateQiTaoInput input) { ValidateQiTaoOutput output = new ValidateQiTaoOutput(); @@ -111,6 +114,9 @@ throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�"); } + //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉 + var curUserName = App.User.FindFirst(ClaimConst.RealName)?.Value; + var setValue = ""; var _QiTaoReuslt = ""; var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync(); @@ -118,12 +124,12 @@ if (num > 0) { //涓嶉綈濂� - setValue = $"{input.PackageCode}|涓嶉綈濂�"; + setValue = $"{input.PackageCode}|涓嶉綈濂梶" + curUserName; _QiTaoReuslt = "涓嶉綈濂�"; } else { - setValue = $"{input.PackageCode}|榻愬"; + setValue = $"{input.PackageCode}|榻愬|" + curUserName; _QiTaoReuslt = "榻愬"; } @@ -132,7 +138,25 @@ sysConfig.Value = setValue; await _sysConfigRep.UpdateAsync(sysConfig); - //璁板綍宸ヤ綔鏃堕棿鍜屽伐浣滀汉 + + var sysConfig_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper); + if (sysConfig_wms_unline_oper == null) + { + throw Oops.Oh($"娌℃湁閰嶇疆 鍖呰涓嬬嚎鎿嶄綔浜� 鍊�"); + } + if (sysConfig_wms_unline_oper.Value != curUserName) + { + sysConfig_wms_unline_oper.Value = curUserName; + await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_oper); + + var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time); + if (sysConfig_wms_unline_time == null) + { + throw Oops.Oh($"娌℃湁閰嶇疆 鍖呰涓嬬嚎鐧婚檰鏃堕棿 鍊�"); + } + sysConfig_wms_unline_time.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + await _sysConfigRep.UpdateAsync(sysConfig_wms_unline_time); + } output = package.Adapt<ValidateQiTaoOutput>(); @@ -175,6 +199,6 @@ } - + } 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 index f06a6b0..cf9db38 100644 --- 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 @@ -34,6 +34,16 @@ public virtual bool? IsUnline { get; set; } /// <summary> + /// 涓嬬嚎鏃堕棿 + /// </summary> + public virtual DateTime? UnlineTime { get; set; } + + /// <summary> + /// 涓嬬嚎浜� + /// </summary> + public virtual string UnlinePerson { get; set; } + + /// <summary> /// 鍖呮暟 /// </summary> public virtual int PackageNum { get; set; } @@ -136,6 +146,20 @@ public bool? IsUnline { get; set; } /// <summary> + /// 涓嬬嚎鏃堕棿 + /// </summary> + public DateTime? UnlineTime { get; set; } + + /// <summary> + /// 涓嬬嚎鏃堕棿鑼冨洿 + /// </summary> + public List<DateTime?> UnlineTimeRange { get; set; } + /// <summary> + /// 涓嬬嚎浜� + /// </summary> + public string? UnlinePerson { get; set; } + + /// <summary> /// 鍖呮暟 /// </summary> public int? PackageNum { get; set; } 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 index a14753a..99d8e91 100644 --- 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 @@ -36,6 +36,16 @@ public bool? IsUnline { get; set; } /// <summary> + /// 涓嬬嚎鏃堕棿 + /// </summary> + public DateTime? UnlineTime { get; set; } + + /// <summary> + /// 涓嬬嚎浜� + /// </summary> + public string UnlinePerson { get; set; } + + /// <summary> /// 鍖呮暟 /// </summary> public int PackageNum { 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 index 9408072..45cdcd7 100644 --- 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 @@ -129,6 +129,7 @@ u.Info5.Contains(input.SearchKey.Trim()) || u.PlanNo.Contains(input.SearchKey.Trim()) || u.OrderId.Contains(input.SearchKey.Trim()) + || u.UnlinePerson.Contains(input.SearchKey.Trim()) || u.CreateUserName.Contains(input.SearchKey.Trim()) || u.UpdateUserName.Contains(input.SearchKey.Trim()) ) @@ -137,10 +138,21 @@ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim())) .WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting) .WhereIF(input.IsUnline.HasValue, u => u.IsUnline == input.IsUnline) + .WhereIF(!string.IsNullOrWhiteSpace(input.UnlinePerson), u => u.UnlinePerson.Contains(input.UnlinePerson.Trim())) .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.UnlineTimeRange != null && input.UnlineTimeRange.Count >0) + { + DateTime? start= input.UnlineTimeRange[0].Value.AddDays(-1); + query = query.WhereIF(start.HasValue, u => u.UnlineTime > start); + if (input.UnlineTimeRange.Count >1 && input.UnlineTimeRange[1].HasValue) + { + var end = input.UnlineTimeRange[1].Value.AddDays(1); + query = query.Where(u => u.UnlineTime < end); + } + } return query; } diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs index 0a22a6b..4b98a46 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Core/Const/CommonConst.cs @@ -105,6 +105,17 @@ /// <summary> + /// 鍖呰涓嬬嚎鎿嶄綔浜� 銆怑ditby shaocx,2024-11-28銆� + /// </summary> + public const string wms_unline_oper = "wms_unline_oper"; + + /// <summary> + /// 鍖呰涓嬬嚎鐧婚檰鏃堕棿 銆怑ditby shaocx,2024-11-28銆� + /// </summary> + public const string wms_unline_time = "wms_unline_time"; + + + /// <summary> /// 榛樿鐨凟RP搴撳瓨鍦� /// </summary> public const string DefaultErpCode = "default_erpCode"; -- Gitblit v1.9.3