PDA生产组托扫描托条码调用方法修改，新增用户模块权限判断控制方法

yxj

2025-10-11 92993b722fd262c7b8179abe64c4ba5ccc07c6f2

 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)
@@ -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");