From a71373599d6bddfcf3a65a288be80cbf2b1f9e30 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期日, 04 十二月 2022 21:34:53 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 739115e..08f5120 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -817,6 +817,7 @@ return objJsonResult; } + oCN.RunProc("update sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'"); oCN.Commit(); objJsonResult.code = "0"; objJsonResult.count = 1; @@ -949,6 +950,7 @@ JArray Fentity3 = new JArray(); JObject FentityModel3 = new JObject(); + FentityModel3.Add("FDetailID", "0");// FentityModel3.Add("FSrcBillType", "PUR_ReceiveBill"); //婧愬崟绫诲瀷 FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //鏀舵枡閫氱煡鍗曞崟鍙� FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富ID @@ -961,6 +963,22 @@ FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //璁㈠崟琛屽彿 Fentity3.Add(FentityModel3); FentityModel.Add("FReferDetail", Fentity3); + + + JArray Fentity4 = new JArray(); + JObject FentityModel4 = new JObject(); + FentityModel4.Add("FEntity_Link_FRuleId", "QM_PURReceive2Inspect"); //鍗曟嵁杞崲瑙勫垯 + FentityModel4.Add("FEntity_Link_FSTableName", "T_PUR_RECEIVEENTRY"); //鏀舵枡閫氱煡鍗曞瓙琛� + FentityModel4.Add("FEntity_Link_FSBillId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富鍐呯爜 + FentityModel4.Add("FEntity_Link_FSId", HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙鍐呯爜 + FentityModel4.Add("FEntity_Link_FBaseAcceptQtyOld", HRightQty.ToString()); // + FentityModel4.Add("FEntity_Link_FBaseInspectQtyOld", HRightQty.ToString()); // + FentityModel4.Add("FEntity_Link_FInspectQtyOld", HRightQty.ToString()); // + Fentity4.Add(FentityModel4); + FentityModel.Add("FEntity_Link", Fentity4); + + + Fentity.Add(FentityModel); model.Add("FEntity", Fentity); //鏄庣粏淇℃伅 JObject jsonRoot = new JObject() -- Gitblit v1.9.1