From 07968530fd2a7c0d818adc8a89c96a9499dbbee6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:17:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 161 +++++++++++++++++++++++++++++------------------------
1 files changed, 89 insertions(+), 72 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 94d6155..d1917d2 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() }); //璐ㄦ閮ㄩ棬
+ 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);
@@ -1853,75 +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");
+ ////}
- 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";
--
Gitblit v1.9.1