From 965154b8d12864ddd18c49a7a6fb58347ce10fb9 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 12月 2024 15:41:59 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 8 ++--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanInput.cs | 4 --
CC/iWareSql/DataAccess/StationHandlerV2.cs | 4 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs | 8 ++--
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 41 +++++++++-----------
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue | 4 +-
LA24030_LuLiPackageLine_Web/src/views/main/WmsStockQuan/wmsStockQuan/index.vue | 1
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue | 4 +-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs | 1
11 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/CC/iWareSql/DataAccess/StationHandlerV2.cs b/CC/iWareSql/DataAccess/StationHandlerV2.cs
index 221b9af..0cd7e53 100644
--- a/CC/iWareSql/DataAccess/StationHandlerV2.cs
+++ b/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);
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
index a2b1103..e5f7d12 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
+++ b/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>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
index 59c1111..c0c5d6e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
@@ -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="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
index b5b37d8..92f0026 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
+++ b/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>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
index 97a44ce..32d8ba0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
@@ -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="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsStockQuan/wmsStockQuan/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsStockQuan/wmsStockQuan/index.vue
index 7f88552..71d67e9 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsStockQuan/wmsStockQuan/index.vue
+++ b/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';
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
index 9845132..eeb0504 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
+++ b/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;
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
index c82ba73..23b52c4 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
+++ b/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;
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 c6af587..50b71cc 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
@@ -381,7 +381,3 @@
{
}
-
-
-
-
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
index 3e605ab..cf82253 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -146,4 +146,5 @@
public bool IsDelete { 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 b24e962..fe70b9d 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
@@ -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
}
--
Gitblit v1.9.3