From d6c5a95d053db65ae6051e5086cc3472f9fd7812 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 09 十月 2022 09:55:29 +0800
Subject: [PATCH] 修改 生产计划平台
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 781a0a4..aaf700a 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -212,18 +212,23 @@
return objJsonResult;
}
//鏍规嵁浠诲姟鍗曟煡鎵惧埌閲戣澏鐨勭敓浜ц鍗�
- DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
+ DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
DataRow dr1 = ds1.Tables[0].Rows[0];
JObject model = new JObject();
model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+ model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
+ model.Add("FBillNo", HBillNo);
+
JArray Fentity = new JArray();
+
foreach (DataRow item in ds.Tables[0].Rows)
{
JObject FentityModel = new JObject();
- FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = "1" });//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FIsNew", false);// 婧愬崟绫诲瀷
+ FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = dr1["FREPORTTYPENUMBER"].ToString() });//鐢熶骇姹囨姤绫诲瀷
FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
FentityModel.Add("FProductType", "1");// 浜у搧绫诲瀷
FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
@@ -235,7 +240,7 @@
FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // 鐢熶骇杞﹂棿
FentityModel.Add("FStandHourUnitId", "3600"); // 鍗曚綅鏍囧噯宸ユ椂鍗曚綅
FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // 鐗╂枡缂栫爜
- FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//鐢熶骇璁㈠崟琛屽彿
+ FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
@@ -251,6 +256,9 @@
FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
+ FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
+ FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
+ //鎵瑰彿
//FFLOWID FFLOWLINEID FRULEID FSTABLENAME
//f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
//涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
@@ -291,12 +299,12 @@
//["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
["Model"] = model
};
- LogService.Write("jsonRoot:" + jsonRoot);
+
string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
//鍒ゆ柇淇濆瓨鏄惁鎴愬姛
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
-
+ LogService.Write("宸ュ簭姹囨姤鍗曞叆搴撻敊璇痡sonRoot:" + jsonRoot);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -314,7 +322,7 @@
Ids = fID,
};
result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
- //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//瀹℃牳
+ result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
oCN.RollBack();
@@ -324,6 +332,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1