From eb352c4c795ec53626e32ed9740e6e6746b8a28c Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Tue, 24 Nov 2020 13:35:29 +0800
Subject: [PATCH] =?UTF-8?q?qad=E6=94=B6=E8=B4=A7=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UniApiGroup/Config/UniApiConfig.cs            |  2 +-
 .../Controller/OdbcApiQadController.cs        | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/UniApiGroup/Config/UniApiConfig.cs b/UniApiGroup/Config/UniApiConfig.cs
index 9c5d382..4d83a75 100644
--- a/UniApiGroup/Config/UniApiConfig.cs
+++ b/UniApiGroup/Config/UniApiConfig.cs
@@ -12,7 +12,7 @@
         public bool Qad供应商 { get; set; } = true;
         public bool Qad供应商零件 { get; set; } = true;
         public bool Qad采购订单 { get; set; } = false;
-        //public bool Qad收货单 { get; set; } = true;
+        public bool Qad收货单 { get; set; } = false;
         public bool Qad采购收货单 { get; set; } = false;
         public bool Wms收货单 { get; set; } = true;
         public bool Wms退货单 { get; set; } = true;
diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs
index 185e203..93aee88 100644
--- a/UniApiGroup/Controller/OdbcApiQadController.cs
+++ b/UniApiGroup/Controller/OdbcApiQadController.cs
@@ -103,6 +103,19 @@ namespace CK.SCP.GrupUniApi.Controller
                             else
                                 continue;
                             break;
+                        case QadTableName.xxqad_prh_det:
+                            if (GlobalVar.ApiConfig.Qad�ջ���)
+                            {
+                                Console.WriteLine($"���� QAD �ӿ����ݣ�{qadCtrl.xxqad_table}:{qadCtrl.xxqad_table_qty}");
+                                AddReceive(idb, wdb, qadCtrl.xxqad_seq, 0);
+                                AddReject(idb, wdb, qadCtrl.xxqad_seq, 1);
+                                qadCtrl.xxqad_scm = ((int)UniApiState.�ɹ�).ToString();
+                                EntitiesFactory.SaveDb(wdb);
+                                EntitiesFactory.SaveDb(authdb);
+                            }
+                            else
+                                continue;
+                            break;
                         case QadTableName.xxqad_pprice_det: //�ɹ��۸�
                              Console.WriteLine($"���� QAD �ӿ����ݣ�{qadCtrl.xxqad_table}:{qadCtrl.xxqad_table_qty}");
                              UpdatePrice(idb, wdb, qadCtrl.xxqad_seq);
@@ -119,14 +132,7 @@ namespace CK.SCP.GrupUniApi.Controller
                             EntitiesFactory.SaveDb(authdb);
 
                             break;
-                        case QadTableName.xxqad_prh_det:                           
-                            Console.WriteLine($"���� QAD �ӿ����ݣ�{qadCtrl.xxqad_table}:{qadCtrl.xxqad_table_qty}");
-                            AddReceive(idb, wdb, qadCtrl.xxqad_seq,0 );
-                            AddReject(idb, wdb, qadCtrl.xxqad_seq, 1);
-                            qadCtrl.xxqad_scm = ((int)UniApiState.�ɹ�).ToString();
-                            EntitiesFactory.SaveDb(wdb);
-                            EntitiesFactory.SaveDb(authdb);
-                            break;
+
                     }
                     //qadCtrl.xxqad_scm = ((int)UniApiState.�ɹ�).ToString();
                     //EntitiesFactory.SaveDb(wdb);