From 5057e75e1837bcdf9e7e60de7970bf8a1d3dda92 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 09 一月 2026 12:23:23 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index bd41db0..13dd4a1 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/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();
--
Gitblit v1.9.1