1

wtt

7 天以前 5057e75e1837bcdf9e7e60de7970bf8a1d3dda92

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1708,22 +1708,26 @@
                    return objJsonResult;
                }

                // string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                //             join AIS20210811135644..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                //             join AIS20210811135644..T_BD_STAFFTEMP c on c.FID = a.FID
                //             join AIS20210811135644..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
                //             where e.HItemID ='" + HKeeperID + "' ";
                // //查询质检员对应质检部门
                // ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                // LogService.Write("sql" + sql);
                // if (ds.Tables[0].Rows.Count == 0)
                // {
                //     objJsonResult.code = "0";
                //     objJsonResult.count = 0;
                //     objJsonResult.Message = "操作失败,质检员对应质检部门无数据。" + sql;
                //     objJsonResult.data = null;
                //     return objJsonResult;
                // }
                //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
                             join JL20250716203240..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
                             where e.HItemID ='" + HKeeperID + "' ";
                    //查询质检员对应质检部门
                    ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                    LogService.Write("sql" + sql);
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "操作失败,质检员对应质检部门无数据。" + sql;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                //}
                


                JObject model = new JObject();
@@ -1732,8 +1736,12 @@
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期
                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() }); //质检部门
                //model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门

                //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);
@@ -1859,7 +1867,7 @@


                result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                //result2 = InvokeHelper.Audit("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();
@@ -1888,7 +1896,15 @@
                        //文件IO流
                        string a = Convert.ToBase64String(buffer);

                        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());

@@ -1901,6 +1917,7 @@
                               " \"AliasFileName\":\"test\"," +
                               " \"SendByte\":\"" + a + "\"" +
                           "}";
                        // 下面的方式适用于 金蝶云 8.0以上版本
                        string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
                        LogService.Write("json:" + jsonStr);
                        LogService.Write("_vlog:" + _vlog);
@@ -1914,20 +1931,12 @@
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

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


                    //string jsonStr = "{" +
                    //   " \"FileName\":\"" + HFileName + "\"," +
                    //       " \"FormId\":\"QM_InspectBill\"," +
                    //       " \"IsLast\":\"true\"," +
                    //       " \"InterId\":\"" + HInterID + "\"," +
                    //       " \"BillNO\":\"" + HBillNo + "\"," +
                    //       " \"AliasFileName\":\"test\"," +
                    //       " \"SendByte\":\"" + a + "\"," +
                    //   "}";

                    //var ret = client.AttachmentUpload(jsonStr);
                }

                oCN.Commit();