From f9e3252c454e476ed1ee00b081d83751f623fc3e Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期二, 11 三月 2025 09:49:31 +0800
Subject: [PATCH] 1

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
index b6c9f94..d777c35 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
@@ -88,7 +88,7 @@
                 {
                     #region 鐢熸垚鍓旈櫎璐т綅鍏ュ簱浠诲姟
                     //鍒ゆ柇鏁村舰鏈轰俊鍙�
-                    if(!OHTJob.oHTReadData.R_ZXJ_TC_isready&& !OHTJob.oHTReadData.R_TCMode_TC)
+                    if (!OHTJob.oHTReadData.R_ZXJ_TC_isready && !OHTJob.oHTReadData.R_TCMode_TC)
                     {
                         throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
                     }
@@ -135,7 +135,7 @@
                     var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
                     //鏌ヨ搴撳瓨鐗╂枡搴撳瓨淇℃伅
                     var stocks = _StockInfoRepository.QueryData(v => v.Remark == 3 && v.BatchNo == batch.OutBatch && v.StockStatus == 0)
-                        .OrderBy(v => v.CreateDate).ToList();
+                            .OrderBy(v => v.CreateDate).ToList();
                     if (stocks.Count <= 0)
                     {
                         throw new Exception($"褰撳墠搴撳瓨涓病鏈夈�恵batch.materType}銆戯紙0鑷骇 1澶栬喘锛変笖鎵规涓恒�恵batch.OutBatch}銆戠殑鐗╂枡");
@@ -169,18 +169,19 @@
                 }
                 catch (Exception ex)
                 {
+                    _unitOfWorkManage.RollbackTran();
                     _ErrormsginfoService.UpdateErrorMsg(ex.Message, 6);
                 }
 
                 try
                 {
                     #region 鐢熸垚鍏ュ簱浠诲姟
-                    
 
-                    //if (!OHTJob.oHTReadData.R_GZJ_isWork)
-                    //{
-                    //    throw new Exception($"瑙勬暣鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
-                    //}
+
+                    if (!OHTJob.oHTReadData.R_GZJ_isWork)
+                    {
+                        throw new Exception($"瑙勬暣鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
+                    }
                     var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
                     //鍏ュ簱
                     if (Inisout.InOut==1)

--
Gitblit v1.9.3