Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2026-03-05 f66d4e7970b06a9842a9364845ea8a83c0169712

 WebAPI/Controllers/Êý¾Ýͬ²½/СÖî¸ðͬ²½/XZG_DataSynchronizationController.cs

@@ -653,7 +653,7 @@
                //生产订单同步（erp->小诸葛）
                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)