From 4b0ac821502f956d7b0acd73f80a384ee41f6a6a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 01 三月 2021 10:16:55 +0800
Subject: [PATCH] 日计划导入增加生产订单明细行号功能

---
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 4498075..4e38a3d 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -164,7 +164,7 @@
         /// </summary>
         public void ExportExcel()
         {
-            List<string> Title = new List<string> {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�*","鐢熶骇缁勭粐*", "鐢熶骇杞﹂棿*", "鐢熶骇璧勬簮", "浜у搧浠g爜*", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁¢噺鍗曚綅",
+            List<string> Title = new List<string> {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�*","鐢熶骇璁㈠崟鏄庣粏琛屽彿*", "鐢熶骇杞﹂棿*", "鐢熶骇璧勬簮", "浜у搧浠g爜*", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁¢噺鍗曚綅",
                 "鎵规鍙�","閿�鍞鍗曟暟閲�","鐢熶骇璁㈠崟鏁伴噺","鎬婚綈濂楁暟閲�","浜よ揣鏃ユ湡*","璁㈠崟绛夌骇*"};
             /*
              ,"T0","T1","T2","T3","T4","T5","T6","T7",
@@ -365,13 +365,14 @@
             }
 
             int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
-            if (result > 0)
-            {
-                this.View.ShowMessage("鎿嶄綔鎴愬姛");
-                SearchList();
-            }
-            else
-                this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+
+            this.View.ShowMessage("鎿嶄綔鎴愬姛");
+            SearchList();
+            //if (result > 0)
+            //{
+            //}
+            //else
+            //    this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
 
         }
         /// <summary>
@@ -953,7 +954,7 @@
 LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID 
 LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId 
 LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID
---join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
 where d.FAvailableComplete<>0
 --where T1.FMATERIALID in (105773)
 ");
@@ -972,8 +973,8 @@
 ) T1 
 LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID 
 LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID
---join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
---where d.FAvailableComplete<>0
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
 --where T1.FMATERIALID in (105773)
 group by T1.FStockOrgId,T1.FMATERIALID
 ");

--
Gitblit v1.9.1