1

llj

13 小时以前 4c2d6fc7aeb7fe0cc44b2735514d47ff2ace18fa

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1708,8 +1708,8 @@
                    return objJsonResult;
                }

                if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                {
                //if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                //{
                    string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                             join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                             join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1726,7 +1726,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                //}
                


@@ -1737,11 +1737,11 @@
                model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织
                model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门

                if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                {
                LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
                // if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                // {
                    model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                }
                // }
                model.Add("FISSYNCED", "false");//  是否已同步
                model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));//  报检日期
                model.Add("FBillNo", HBillNo);
@@ -1861,83 +1861,84 @@
                    Ids = fID,
                };

                
                K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
                //        K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");


                // 锦隆 仅保留新建功能
                //result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                //// result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                //if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                //{
                    //oCN.RollBack();
                    //objJsonResult.code = "0";
                    //objJsonResult.count = 0;
                    //objJsonResult.Message = $"来料检验单号：{fBillNo}，提交失败" + result;
                    //objJsonResult.data = null;
                    //return objJsonResult;
                //}
                //else
                //{

                result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"来料检验单号：{fBillNo}，提交失败" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    //DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList  where  HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList");

                    DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList  where  HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList");
                    //for (var i = 0; i < ds1.Tables[0].Rows.Count; i++)
                    //{
                        //string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]);
                        //string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]);

                    for (var i = 0; i < ds1.Tables[0].Rows.Count; i++)
                    {
                        string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]);
                        string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]);
                        //string path = HFilePath;
                        //FileInfo fi = new FileInfo(path);
                        //long len = fi.Length;
                        //byte[] buffer = new byte[len];
                        //FileStream fs = new FileStream(path, FileMode.Open);
                        //fs.Read(buffer, 0, (int)len);
                        ////文件IO流
                        //string a = Convert.ToBase64String(buffer);

                        string path = HFilePath;
                        FileInfo fi = new FileInfo(path);
                        long len = fi.Length;
                        byte[] buffer = new byte[len];
                        FileStream fs = new FileStream(path, FileMode.Open);
                        fs.Read(buffer, 0, (int)len);
                        //文件IO流
                        string a = Convert.ToBase64String(buffer);

                        //if(oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                        //{
                            ds = oCN.RunProcReturn("select * from  JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        //else
                        //{
                        //    ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        ////if(oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                        ////{
                            //ds = oCN.RunProcReturn("select * from  JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        ////}
                        ////else
                        ////{
                        ////    ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        ////}


                        HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
                        //HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());

                        string jsonStr = "{" +
                           " \"FileName\":\"" + HFileName + "\"," +
                               " \"FormId\":\"QM_InspectBill\"," +
                               " \"IsLast\":\"true\"," +
                               " \"InterId\":\"" + HInterID + "\"," +
                               " \"BillNo\":\"" + HBillNo + "\"," +
                               " \"AliasFileName\":\"test\"," +
                               " \"SendByte\":\"" + a + "\"" +
                           "}";
                        // 下面的方式适用于 金蝶云 8.0以上版本
                        string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
                        LogService.Write("json:" + jsonStr);
                        LogService.Write("_vlog:" + _vlog);
                        //string jsonStr = "{" +
                           //" \"FileName\":\"" + HFileName + "\"," +
                               //" \"FormId\":\"QM_InspectBill\"," +
                               //" \"IsLast\":\"true\"," +
                               //" \"InterId\":\"" + HInterID + "\"," +
                               //" \"BillNo\":\"" + HBillNo + "\"," +
                               //" \"AliasFileName\":\"test\"," +
                               //" \"SendByte\":\"" + a + "\"" +
                           //"}";
                        //// 下面的方式适用于 金蝶云 8.0以上版本
                        //string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
                        //LogService.Write("json:" + jsonStr);
                        //LogService.Write("_vlog:" + _vlog);
                        
                        if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                        {
                            oCN.RollBack();
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"来料检验单号：{fBillNo}，照片同步失败" + _vlog;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                        //{
                            //oCN.RollBack();
                            //objJsonResult.code = "0";
                            //objJsonResult.count = 0;
                            //objJsonResult.Message = $"来料检验单号：{fBillNo}，照片同步失败" + _vlog;
                            //objJsonResult.data = null;
                            //return objJsonResult;
                        //}

                        // 下面的方式适用于 金蝶云 8.0以下版本
                        // var ret = client.AttachmentUpload(jsonStr);
                    }
                        //// 下面的方式适用于 金蝶云 8.0以下版本
                        //// var ret = client.AttachmentUpload(jsonStr);
                    //}


                }
                //}

                oCN.Commit();
                objJsonResult.code = "0";