From f66d4e7970b06a9842a9364845ea8a83c0169712 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 三月 2026 13:41:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/数据同步/小诸葛同步/XZG_DataSynchronizationController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 a85cc04..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)},
@@ -832,13 +832,13 @@
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 proc with(nolock) on a.FMATERIALID = proc.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 proc.FWORKSHOPID = 477069 --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
+ and proce.FWORKSHOPID = 477069 --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
and b.FErpClsID = 2 --鐗╂枡灞炴��(2锛氳嚜鍒�)
and
(
--
Gitblit v1.9.1