From c14f8a94958772b5aa0fdd8e128c4e8a2edc2100 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 25 二月 2026 16:14:26 +0800
Subject: [PATCH] 成本费用单编辑增加工序
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index bd4a7ae..a6e8588 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1697,6 +1697,7 @@
") ");
//鍚屾閲戣澏
//璁块棶閲戣澏
+ string sErr = "";
var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
@@ -1707,24 +1708,30 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
- string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ 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;
+ //鏌ヨ璐ㄦ鍛樺搴旇川妫�閮ㄩ棬
+ 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();
@@ -1733,8 +1740,15 @@
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() }); //璐ㄦ鍛�
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ 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);
@@ -1775,7 +1789,26 @@
FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
- FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ // 閿﹂殕鍚敤涓嶈壇澶勭悊
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
+ // 鍒ゆ柇鍗曟嵁鏄惁鍚堟牸
+ if (HCheckResult.ToString() == "2")
+ {
+ FentityModel2.Add("FIsDefectProcess", true); //涓嶈壇澶勭悊
+ }
+ else
+ {
+ FentityModel2.Add("FIsDefectProcess", false);
+ }
+ }
+ else
+ {
+ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ }
+ }
FentityModel2.Add("FCanSale", false); //鍙攢鍞�
FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
FentityModel2.Add("FIsReturn", true); //鍒ら��
@@ -1845,6 +1878,7 @@
return objJsonResult;
}
//鎻愪氦瀹℃牳
+ string result0 = string.Empty;
string result1 = string.Empty;
string result2 = string.Empty;
var fID = JObject.Parse(result)["Result"]["Id"].ToString();
@@ -1854,13 +1888,19 @@
Ids = fID,
};
+
K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
// K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
-
-
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
+ result0 = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(json));//淇濆瓨
+ }
+ }
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,8 +1928,17 @@
fs.Read(buffer, 0, (int)len);
//鏂囦欢IO娴�
string a = Convert.ToBase64String(buffer);
+ if (oSystemParameter.ShowBill(ref sErr)) {
+ 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());
@@ -1906,7 +1955,7 @@
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();
--
Gitblit v1.9.1