From d3835d49a3c673a37c78a79600320e287d4d320b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 06 三月 2021 10:54:38 +0800
Subject: [PATCH] 日计划导入增加删除用料清单审核状态验证 齐套信息明细 颜色渲染更改

---
 src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs |    6 ++++++
 src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs            |   17 +++++++++++++++++
 src/BLL/Demo.BillView/PRD/Pro_TlPushAudit.cs            |    9 ---------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index ea84275..fad5668 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -20,6 +20,7 @@
         bool did = false;
         string FHICMOInterID = "";//鏃ヨ鍒掑伐鍗曞唴鐮�
         string tempName = "JIT_MOMaterReadysBill";//琛ㄥ悕绉�
+
         public override void OnLoad(EventArgs e)
         {
             LogHelper.Info("[榻愬鍒嗘瀽鏄庣粏鍔犺浇鍒楄〃]");
@@ -66,6 +67,7 @@
                 did = true;
             }
         }
+
         private void ChangeColor()
         {
             Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
@@ -79,6 +81,10 @@
                 {
                     grid.SetRowBackcolor("#71FF98CB", _i);
                 }
+                else
+                {
+                    grid.SetRowBackcolor("#ffffff", _i);
+                }
                 _i++;
             }
         }
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 781dd1b..bb3f2a8 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -277,6 +277,23 @@
                     this.View.ShowErrMessage(_result);
                     return;
                 }
+                //鏍¢獙鐢熶骇鐢ㄦ枡娓呭崟鏄惁瀹℃牳
+                foreach (DynamicObject current in entityDataObjoct)
+                {
+                    //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+                    sql = string.Format(@"/*dialect*/SELECT FBILLNO FROM T_PRD_PPBOM T1
+WHERE T1.FMOBILLNO = '{0}'  AND T1.FMATERIALID = '{1}' AND T1.FMOENTRYSEQ = '{2}' and FDOCUMENTSTATUS <>'C'                          
+", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+                    DataTable dt = new DataTable();
+                    dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+                    if (dt.Rows.Count > 0)
+                        _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + ",鐢熶骇璁㈠崟鏄庣粏琛屽彿锛�" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "鐗╂枡" + (current["FMatrailId"] as DynamicObject)["Number"] + "瀵瑰簲鐨勭敓浜х敤鏂欐竻鍗曪細" + dt.Rows[0][0] + "鏈鏍�";
+                }
+                if (_result != "")
+                {
+                    this.View.ShowErrMessage(_result);
+                    return;
+                }
                 foreach (DynamicObject current in entityDataObjoct)
                 {
                     if (Convert.ToInt32(current["FNoScheduled"]) < 0)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_TlPushAudit.cs b/src/BLL/Demo.BillView/PRD/Pro_TlPushAudit.cs
index 7637183..010b513 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_TlPushAudit.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_TlPushAudit.cs
@@ -15,15 +15,6 @@
 
 namespace Demo.DynamicForm.PRD
 {
-    /// <summary>
-    /// 鎻掍欢绀轰緥锛氬紩鍏ラ攢鍞嚭搴撳崟锛屽缓绔嬩笌閿�鍞鍗曠殑鍏宠仈
-    /// </summary>
-    /// <remarks>
-    /// 瑕佹眰锛�
-    /// 1. 闇�瑕佸紩鍏ュ崟鎹綋鐨勬簮鍗曠被鍨嬨�佹簮鍗曠紪鍙峰瓧娈�
-    /// 2. 鏈彃浠舵寕鍦ㄩ攢鍞嚭搴撳崟鐨勪繚瀛樻搷浣滀笂
-    /// 鍑哄簱鍏宠仈閿�鍞鍗�
-    /// </remarks>
     [Description("閫佽揣璁″垝鍗曟彃浠跺叧鑱旀彁鏂欒鍒掑崟")]
     [HotUpdate]
     public class Pro_TlPushAudit : AbstractOperationServicePlugIn

--
Gitblit v1.9.1