From cf6a69eed3ac59698f16ee08aedd73d34cf6790d Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 15 一月 2026 11:43:08 +0800
Subject: [PATCH] 代码优化
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs"
index 79dd57a..02f8616 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_CheckService/ReCheckOrderService.cs"
@@ -66,7 +66,11 @@
{
try
{
-
+ List<Dt_ReCheckOrder> reCheckOrders = BaseDal.Db.Queryable<Dt_ReCheckOrder>().Where(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo).ToList();
+ if (reCheckOrders.Count() == 3)
+ {
+ return WebResponseContent.Instance.Error($"璇ョ墿鏂欏拰鎵规宸茬粡閲嶆浜嗕笁娆★紝涓嶅厑璁稿啀杩涜閲嶆");
+ }
if (BaseDal.QueryFirst(x => x.OrderNo == model.OrderNo) != null)
{
return WebResponseContent.Instance.Error($"{model.OrderNo}鍗曞彿閲嶅");
@@ -105,7 +109,8 @@
{
try
{
-
+ List<Dt_ReCheckOrder> reCheckOrders = BaseDal.Db.Queryable<Dt_ReCheckOrder>().Where(x=>x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo).ToList();
+
var recheckOrder = Db.Queryable<Dt_ReCheckOrder>().Where(x => x.OrderNo == model.OrderNo).First();
if (recheckOrder == null)
{
@@ -116,10 +121,10 @@
{
isupdate = true;
}
- if (model.Result != 0 && recheckOrder.SignSeq != model.SignSeq)
+ if (model.Result == 1 && recheckOrder.SignSeq != model.SignSeq)
{
var stockDetailIds = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo && x.ValidDate != null)
+ .Where(x => x.MaterielCode == model.MaterielCode && x.BatchNo == model.BatchNo && x.ValidDate != null && x.Status == (int)StockStatusEmun.鎵嬪姩鍐荤粨)
.Select(x => x.Id)
.ToList();
@@ -132,21 +137,21 @@
.Where(x => stockDetailIds.Contains(x.Id))
.ExecuteCommand();
- if (model.InspectionNumber == 1)
+ if (1 == reCheckOrders.Count())
{
BaseDal.Db.Updateable<Dt_StockInfoDetail>()
.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.OneExtensionDays)))
.Where(x => stockDetailIds.Contains(x.Id))
.ExecuteCommand();
}
- else if (model.InspectionNumber == 2)
+ else if (2 == reCheckOrders.Count())
{
BaseDal.Db.Updateable<Dt_StockInfoDetail>()
.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.TwoExtensionDays)))
.Where(x => stockDetailIds.Contains(x.Id))
.ExecuteCommand();
}
- else
+ else if (3 == reCheckOrders.Count())
{
BaseDal.Db.Updateable<Dt_StockInfoDetail>()
.SetColumns(x => x.ValidDate == Convert.ToDateTime(x.ValidDate).AddDays(Convert.ToDouble(datevaliDate.ThreeExtensionDays)))
--
Gitblit v1.9.3