nothing

YL

2021-08-04 8cf470b4eb5bd987c764862df3f25b27c7263d5f

 CLOUDWEB/WebService1.asmx.cs

@@ -4880,6 +4880,7 @@
                        sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
                    }


                    //生成 生产汇报单 
                    string HReturn;
                    string HReturn2 = ""; 
@@ -5041,7 +5042,7 @@
                oMain.HPeriod = sPeriod;

                DataSet Ds;
                DataSet Ds2;
                //DataSet Ds2;
                // 判断生产订单状态 是否为 完工 或结案
                //Ds2 = oCn.RunProcReturn("exec h_p_Sc_LoadICMOReportStatusCheck " + oMain.HInterID.ToString(), "h_p_Sc_LoadICMOReportStatusCheck");
                //if (Ds2 == null || Ds2.Tables[0].Rows.Count == 0)
@@ -5074,7 +5075,8 @@
                ") ");
                //更新关联数量
                oCn.RunProc("exec h_p_Sc_UpDateRelation_ICMOToICMOReport_Add " + oMain.HInterID.ToString());

              
                
                if (oSystemParameterMain.Sc_ICMOReportBill_AutoCheck == "Y") //系统参数  自动审核 
                {
                    //审核单据
@@ -5085,7 +5087,7 @@
                Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_CLD_WorkQty " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_CLD_WorkQty");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                {
                    sErrMsg = "获取子表信息失败！";
                    sErrMsg = "获取json子表信息失败！";
                    oCn.RollBack();
                    return false;
                }
@@ -5236,7 +5238,7 @@
                    //获取CLOUD账号密码
                    string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
                    string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
                    DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
                    DataSet ds11 = get_SaveMESCLOUDUseNamePsd(oMain.HMaker);
                    if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
                    {
                    }
@@ -5249,10 +5251,10 @@
                    //生成 生产汇报单 
                    string HReturn;
                    string HReturn2 = "";

                    ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                    string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                    bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                    string msgReport = dbId + ';' + sCLOUDUseName + ';' + sCLOUDPsd + ';' + 2052;
                    if (bLogin)
                    {
                        var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
@@ -5268,12 +5270,8 @@
                            var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
                            new object[] { "PRD_MORPT", sJson3 }); //审核单据

                            string sJson4 = "{\"Ids\":\"\",\"Numbers\":[\"" + oMain.HBillNo + "\"],\"EntryIds\":\"\",\"RuleId\":\"PRD_MORPT2INSTOCK\",\"TargetBillTypeId\":\"\",\"TargetOrgId\":\"0\",\"TargetFormId\":\"PRD_INSTOCK\",\"IsEnableDefaultRule\":\"false\",\"IsDraftWhenSaveFail\":\"true\",\"CustomParams\":{}}";
                            var result4 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push",
                            new object[] { "PRD_MORPT", sJson4 }); //下推生产入库单

                            HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
                            HReturn2 = result4.ToString();
                        
                        }
                        else
                        {
@@ -5301,7 +5299,7 @@
                    }
                    else
                    {
                        sErrMsg = "生成生产汇报单失败！登录失败！";
                        sErrMsg = "生成生产汇报单失败！登录失败！"+ msgReport;
                        oCn.RollBack();
                        return false;
                    }
@@ -14077,7 +14075,8 @@
                        }
                        else
                        {
                            sJson_BatchNo = "";
                            sJson_FProduceDate = "";
                            sJson_FExpiryDate = "";
                        }

                        if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
@@ -27344,6 +27343,31 @@
            }
        }


        //获取CLOUD账号密码（根据MES登录账号获取）
        [WebMethod]
        public DataSet get_SaveMESCLOUDUseNamePsd(string HMaker)
        {
            try
            {
                DataSet ds;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("exec h_p_LMES_GetCloudUserByBill " + HMaker.ToString(), "h_p_LMES_GetCloudUserByBill");
                if (ds == null && ds.Tables[0].Rows.Count == 0)
                {
                    return null;
                }
                else
                {
                    return ds;
                }
            }
            catch (Exception e)
            {
                return null;
            }
        }

        //单据上传前判断(物料属性判断    丸井)
        [WebMethod]
        public bool CheckAllowBeforeSave(Int64 HInterID, ref string sMsg)