From ca024b15dcd1b737af09943cc28ee1ca8b798a30 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 08 十二月 2025 16:09:16 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/数据同步/小诸葛同步/XZG_DataSynchronizationController.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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..245a062 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"
@@ -653,7 +653,7 @@
//鐢熶骇璁㈠崟鍚屾锛坋rp->灏忚钁涳級
await icmoInfoSyncFromERPToXZG();
//鐢熶骇姹囨姤鍗曞悓姝�(灏忚钁�->erp)
- await icmoReportInfoSyncFromXZGToERP();
+ //await icmoReportInfoSyncFromXZGToERP();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -735,10 +735,10 @@
{"key", DBUtility.ClsPub.isStrNull(material.key)},
{"productName", DBUtility.ClsPub.isStrNull(material.productName)},
{"partNum",DBUtility.ClsPub.isStrNull(material.partNum)},
- {"sepc", DBUtility.ClsPub.isStrNull(material.sepc)},
+ {"Spec", DBUtility.ClsPub.isStrNull(material.sepc)},
{"weight", DBUtility.ClsPub.isStrNull(material.weight)},
{"headWeight", DBUtility.ClsPub.isStrNull(material.headWeight)},
- {"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
+ //{"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
{"fightsPartnum", DBUtility.ClsPub.isStrNull(material.flightsPartnum)},
{"comments", DBUtility.ClsPub.isStrNull(material.comments)},
{"colorName", DBUtility.ClsPub.isStrNull(material.colorName)},
@@ -781,7 +781,7 @@
{"productName", DBUtility.ClsPub.isStrNull(material.productName)},
{"partNum",DBUtility.ClsPub.isStrNull(material.partNum)},
{"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
- {"sepc", DBUtility.ClsPub.isStrNull(material.sepc)},
+ {"Spec", DBUtility.ClsPub.isStrNull(material.sepc)},
{"weight", DBUtility.ClsPub.isStrNull(material.weight)},
{"headWeight", DBUtility.ClsPub.isStrNull(material.headWeight)},
{"fightsPartnum", DBUtility.ClsPub.isStrNull(material.flightsPartnum)},
@@ -830,12 +830,16 @@
,convert(varchar(100),a.FMODIFYDATE,20) HUpdateDate
from " + erpDatabaseName + @"T_BD_MATERIAL a with(nolock)
inner join " + erpDatabaseName + @"T_BD_MATERIAL_L l with(nolock) on a.FMATERIALID=l.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIALBASE b with(nolock) on a.FMATERIALID=b.FMATERIALID
inner join " + erpDatabaseName + @"T_BD_MATERIALSTOCK s with(nolock) on a.FMATERIALID=s.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIALPRODUCE proce with(nolock) on a.FMATERIALID = proce.FMATERIALID
inner join " + erpDatabaseName + @"T_BD_Unit_L unit with(nolock) on isnull(s.FSTOREUNITID,0) = unit.FUNITID
Where l.FLOCALEID=2052
and unit.FLOCALEID = 2052
and a.FFORBIDSTATUS='A'
and a.FUSEORGID = 1
+ and proce.FWORKSHOPID = 477069 --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
+ and b.FErpClsID = 2 --鐗╂枡灞炴��(2锛氳嚜鍒�)
and
(
convert(varchar(100),a.FCREATEDATE,23) >= convert(varchar(100),DATEADD(day,-1,getdate()),23)
@@ -1099,7 +1103,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 +1115,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 +1126,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