CC/iWareSql/DataAccess/StationHandlerV2.cs
@@ -181,7 +181,7 @@ var emptyStationList = edm.V_EmptyStation.ToList(); //不随机排序 emptyStationList = emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList(); //emptyStationList = emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList(); //增加该库位是否被任务占用的筛选 [EditBy shaocx,2022-06-02] @@ -190,6 +190,8 @@ int placeType = TCSCommon.GetPlaceTypeByWidthLength(upiObj, upiObj.Length, upiObj.Width, ref usePlaceTypeList); //优先查询 var my_emptyStationList = emptyStationList.Where(x => usePlaceTypeList.Contains(x.PlaceType)).OrderBy(x => x.PlaceType).ToList(); //重新排序 my_emptyStationList = my_emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList(); if (my_emptyStationList?.Count() > 0) { wms_base_place toPlace = StationHandler.GetPlaceByPlaceId(my_emptyStationList.First().Id, edm); LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
@@ -31,7 +31,7 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="推送时间" prop="pushTime"> <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="推送时间" /> <el-date-picker v-model="ruleForm.pushTime" type="datetime" placeholder="推送时间" /> </el-form-item>
@@ -26,7 +26,7 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode"> <el-form-item label="推送时间"> <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" /> <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.pushTimeRange" /> </el-form-item> </el-col> @@ -75,7 +75,7 @@ <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag> </template> </el-table-column> <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" /> <el-table-column prop="pushTime" label="推送时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="pushNum" label="推送次数" show-overflow-tooltip="" /> <el-table-column prop="apiMessage" label="接口返回参数" show-overflow-tooltip="" /> <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
@@ -31,7 +31,7 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="推送时间" prop="pushTime"> <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="推送时间" /> <el-date-picker v-model="ruleForm.pushTime" type="datetime" placeholder="推送时间" /> </el-form-item>
@@ -26,7 +26,7 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut"> <el-form-item label="推送时间"> <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPaperCut.pushTimeRange" /> <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPaperCut.pushTimeRange" /> </el-form-item> </el-col> @@ -75,7 +75,7 @@ <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag> </template> </el-table-column> <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" /> <el-table-column prop="pushTime" label="推送时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="pushNum" label="推送次数" show-overflow-tooltip="" /> <el-table-column prop="apiMessage" label="接口返回参数" show-overflow-tooltip="" /> <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Web/src/views/main/WmsStockQuan/wmsStockQuan/index.vue
@@ -235,6 +235,7 @@ import printDialogWmsStockQuan from '/@/views/system/print/component/hiprint/preview.vue' import editDialogWmsStockQuan from '/@/views/main/WmsStockQuan/wmsStockQuan/component/editDialog.vue' import { pageWmsStockQuan, deleteWmsStockQuan,importExcelWmsStockQuan,downloadExcelTemplateWmsStockQuan } from '/@/api/main/WmsStockQuan/wmsStockQuan'; import { getAPI } from '/@/utils/axios-utils'; import { SysEnumApi } from '/@/api-services/api'; LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -138,12 +138,12 @@ .Select<MesPushPackageCodeOutput>(); if(input.PushTimeRange != null && input.PushTimeRange.Count >0) { DateTime? start= input.PushTimeRange[0].Value.AddDays(-1); query = query.WhereIF(start.HasValue, u => u.PushTime > start); DateTime? start= input.PushTimeRange[0].Value; query = query.WhereIF(start.HasValue, u => u.PushTime >= start); if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue) { var end = input.PushTimeRange[1].Value.AddDays(1); query = query.Where(u => u.PushTime < end); var end = input.PushTimeRange[1].Value; query = query.Where(u => u.PushTime <= end); } } return query; LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
@@ -138,12 +138,12 @@ .Select<MesPushPaperCutOutput>(); if(input.PushTimeRange != null && input.PushTimeRange.Count >0) { DateTime? start= input.PushTimeRange[0].Value.AddDays(-1); query = query.WhereIF(start.HasValue, u => u.PushTime > start); DateTime? start= input.PushTimeRange[0].Value; query = query.WhereIF(start.HasValue, u => u.PushTime >= start); if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue) { var end = input.PushTimeRange[1].Value.AddDays(1); query = query.Where(u => u.PushTime < end); var end = input.PushTimeRange[1].Value; query = query.Where(u => u.PushTime <= end); } } return query; LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs
@@ -381,7 +381,3 @@ { }
@@ -146,4 +146,5 @@ public bool IsDelete { get; set; } }
@@ -4,9 +4,6 @@ using System.Data; using System.Web; using System.Text; using System; using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto; namespace Admin.NET.Application; /// <summary> /// 库存信息服务 @@ -15,16 +12,9 @@ public class WmsStockQuanService : IDynamicApiController, ITransient { private readonly SqlSugarRepository<WmsStockQuan> _rep; private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _Mes_BatchOrderUPI_New_Rep; private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan_Rep; public WmsStockQuanService(SqlSugarRepository<WmsStockQuan> rep, SqlSugarRepository<Mes_BatchOrderUPI_New> Mes_BatchOrderUPI_New_Rep, SqlSugarRepository<V_Station_Quan> v_Station_Quan_Rep) public WmsStockQuanService(SqlSugarRepository<WmsStockQuan> rep) { _rep = rep; _Mes_BatchOrderUPI_New_Rep = Mes_BatchOrderUPI_New_Rep; _V_Station_Quan_Rep = v_Station_Quan_Rep; } /// <summary> @@ -199,13 +189,13 @@ return query; } /// <summary> /// 重复性验证 /// </summary> /// <param name="input">验证对象</param> /// <param name="isEdit">是否是编辑</param> /// <returns></returns> private async Task CheckExist( WmsStockQuan input,bool isEdit=false) /// <summary> /// 重复性验证 /// </summary> /// <param name="input">验证对象</param> /// <param name="isEdit">是否是编辑</param> /// <returns></returns> private async Task CheckExist( WmsStockQuan input,bool isEdit=false) { @@ -228,13 +218,20 @@ throw Oops.Oh($"导入数据不能为空"); } //根据组合校验验证表格中中是否已存在相同数据 //根据单独校验验证表格中中是否已存在相同数据 } #endregion #endregion }
