From ff4660980ccfe3e123df8d5fa820266784625c74 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 14 十月 2025 20:39:27 +0800
Subject: [PATCH] 1111
---
代码管理/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 74bb6a5..bb83711 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -1,4 +1,5 @@
-锘縰sing Masuit.Tools;
+锘縰sing MailKit.Search;
+using Masuit.Tools;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -131,7 +132,6 @@
public WebResponseContent GetUpstreamOrder()
{
var responseContent = new WebResponseContent();
-
try
{
// 璇锋眰鍦板潃
@@ -179,6 +179,7 @@
OdrderStatus = "鏂板缓",
Details = order.details.Select(d => new Dt_CabinOrderDetail
{
+ //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
Goods_no = d.goods_no,
Order_qty = d.order_qty,
Batch_num = d.batch_num,
@@ -234,18 +235,17 @@
{
try
{
- // 1. 鍏堟壘鍑鸿嚦灏戞湁涓�鏉＄鍚堟潯浠剁殑鏄庣粏瀵瑰簲鐨勮鍗旾D
- //var validOrderIds = Db.Queryable<Dt_CabinOrderDetail>()
- // .Where(d => d.Status == 0 || d.Status == 2)
- // .Select(d => d.OrderId)
- // .Distinct()
+ //2.鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご = 鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
+ //var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
+ // .Where(o => o.OdrderStatus == "鏂板缓")
+ // .Includes(o => o.Details, d => d.MedicineGoods)
// .ToList();
-
- // 2. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Where(o => o.OdrderStatus == "鏂板缓")
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
+ //鏌ュ嚭鍖呭惈鍏ㄩ儴鐨勫叆搴撳崟锛屽寘鍚叏閮ㄦ槑缁�+涓�涓槑缁嗗搴斾竴涓晢鍝�
+ var orders = BaseDal.Db.CopyNew()
+ .Queryable<Dt_CabinOrder>()
+ .Where(o => o.OdrderStatus == "鏂板缓")
+ .Includes(o => o.Details, d => d.MedicineGoods)
+ .ToList();
// 3. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0锛�
foreach (var order in orders)
{
@@ -315,13 +315,13 @@
if (resp != null && resp.code == "0")
{
// 鏇存柊琛ㄥご鐘舵��
- Db.Updateable<Dt_CabinOrder>()
+ BaseDal.Db.Updateable<Dt_CabinOrder>()
.SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
.Where(o => o.Id == order.Id)
.ExecuteCommand();
// 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
- Db.Updateable<Dt_CabinOrderDetail>()
+ BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
.SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "宸插畬鎴�" })
.Where(d => d.OrderId == order.Id && d.Status == 0)
.ExecuteCommand();
@@ -347,7 +347,7 @@
/// <summary>
- /// 鍏ュ簱鎶ュ畬鎴愭帴鍙�
+ /// 鍏ュ簱鎶ュ畬鎴愭帴鍙� //妫�鏌ヤ竴涓缁嗚〃涓叏閮ㄧ姸鎬佷负瀹屾垚鐨勬椂鍊欏氨灏嗗叆搴撳崟鐨勫紑濮嬫敼鍐欐垚瀹屾垚骞舵帹閫佺粰涓婃父
/// </summary>
/// <param name="order_no">鍏ュ簱鍗曞彿</param>
/// <returns></returns>
@@ -372,7 +372,7 @@
}
// 鍏堟煡琛ㄥご
- var order = Db.Queryable<Dt_CabinOrder>()
+ var order = BaseDal.Db.Queryable<Dt_CabinOrder>()
.First(o => o.Order_no == order_no);
if (order == null)
@@ -381,14 +381,14 @@
}
// 鏌ヨ鎵�鏈夋槑缁嗘槸鍚﹂兘宸插畬鎴�
- var allDetailsCompleted = Db.Queryable<Dt_CabinOrderDetail>()
+ var allDetailsCompleted = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
.Where(d => d.OrderId == order.Id&&d.OrderDetailStatus=="宸插畬鎴�") // 鏄庣粏琛ㄧ敤 OrderId 鍏宠仈涓昏〃
.Count();
if (allDetailsCompleted>0)
{
// 鏇存柊琛ㄥご鐘舵�佷负宸插畬鎴�
- Db.Updateable<Dt_CabinOrder>()
+ BaseDal.Db.Updateable<Dt_CabinOrder>()
.SetColumns(o => o.OdrderStatus == "宸插畬鎴�")
.Where(o => o.Order_no == order_no)
.ExecuteCommand();
@@ -408,6 +408,7 @@
}
}
+
/// <summary>
/// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨
--
Gitblit v1.9.3