From 349ae30efbec2f279047e9b134971f544b636d4e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 06 五月 2025 13:41:01 +0800
Subject: [PATCH] 三升小诸葛接口:生产订单同步修改

---
 WebAPI/Controllers/数据同步/小诸葛同步/XZG_DataSynchronizationController.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
index caf5a42..e717f4e 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
@@ -1099,7 +1099,7 @@
                 List<ICMO> icmos = new List<ICMO>();
                 string sql = @"select 
 	                            cast(a.FBILLNO as varchar(100)) + '_' + cast(b.FSEQ as varchar(10)) + '_' +  cast(b.FENTRYID as varchar(10)) 璁″垝鍗曞彿
-	                            ,cast(b.FQTY as int) 璁″垝鏁伴噺
+	                            ,cast(b.FQTY as int) - cast(c.FSTOCKINQUAAUXQTY as int) 璁″垝鏁伴噺
 	                            ,m.FNUMBER 浜у搧缂栧彿
 	                            ,convert(varchar(100),b.FPLANSTARTDATE,20) 璁″垝寮�宸ユ棩鏈�
 	                            ,convert(varchar(100),b.FPLANFINISHDATE,20) 璁″垝瀹屽伐鏃ユ湡
@@ -1111,7 +1111,7 @@
 	                            ,'' 鑹茬矇鍚嶇О
 	                            ,'' 鏉愭枡缂栧彿
 	                            ,'' 鏉愭枡鍚嶇О
-	                            ,a.FBILLNO 璁㈠崟缂栧彿
+	                            ,ISNULL(b.F_sans_Text,'') 璁㈠崟缂栧彿
 	                            ,ISNULL(convert(varchar(100),c.FSTARTDATE ,20),'') 寮�宸ユ棩鏈�
 	                            ,convert(varchar(100),a.FMODIFYDATE,20) 淇敼鏃ユ湡
                             from " +  erpDatabaseName + @"T_PRD_MO as a
@@ -1122,11 +1122,13 @@
                             where m_l.FLOCALEID=2052
                             and isnull(a.FAPPROVERID,0)<> 0				--宸茬粡瀹℃牳
                             and isnull(c.fstatus,0) in (4)					--涓氬姟鐘舵�侊紙1:璁″垝锛�2:璁″垝纭锛�3:涓嬭揪锛�4:寮�宸ワ紱5:瀹屽伐锛�6:缁撴锛�
+                            and b.FWORKSHOPID in (477069)                   --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
+                            --and a.FBillNo = 'MO233207'
                             and 
 	                            (
-	                            convert(varchar(100),a.fmodifydate,23) >= convert(varchar(100),dateadd(day,-7,getdate()),23)
+	                            convert(varchar(100),a.fmodifydate,23) >= convert(varchar(100),dateadd(day,-1,getdate()),23)
 	                            or
-	                            convert(varchar(100),c.fstartdate ,23) >= convert(varchar(100),dateadd(day,-7,getdate()),23)
+	                            convert(varchar(100),c.fstartdate ,23) >= convert(varchar(100),dateadd(day,-1,getdate()),23)
 	                            )
                             --and cast(a.FBILLNO as varchar(100)) + '_' + cast(b.FSEQ as varchar(10)) = 'MO000269_1'";
                 DataSet ds = oCN.RunProcReturn(sql, "" +  erpDatabaseName + @"T_PRD_MO");

--
Gitblit v1.9.1