From cab2f5a8f48277f1280e7b5803576f33e76a6b8c Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期二, 27 十二月 2022 09:45:54 +0800 Subject: [PATCH] 修改了检验单JSON --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 7 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 08f5120..bb1b19e 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -817,8 +817,8 @@ return objJsonResult; } - oCN.RunProc("update sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'"); oCN.Commit(); + oCN.RunProc("update sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; @@ -882,7 +882,7 @@ ") values(" + HInterID.ToString() + ",1,'',''" + ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" + - ",0,0,0,0,''"+ + ",0,0,0,0,''" + ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" + ") "); //鍚屾閲戣澏 @@ -914,6 +914,7 @@ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁¢噺鍗曚綅鍐呯爜 FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲� FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺 + FentityModel.Add("FUnqualifiedQty", HBadQty.ToString());// 涓嶅悎鏍兼暟閲� FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋� FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵�� FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇� @@ -921,13 +922,14 @@ FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅 FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲� FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟� - FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 + //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 FentityModel.Add("FInspectTimes","1"); // 妫�楠屾鏁� FentityModel.Add("FTimeUnit","24");//鏃堕棿鍗曚綅 FentityModel.Add("FSAMPLEDAMAGEBEARER","2");//鏍锋湰鐮村潖鎵挎媴鏂� FentityModel.Add("FISFIRSTINSPECT", false);//棣栨 FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁� - FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆 + FentityModel.Add("FBaseAcceptQty", HRightQty.ToString());//鍩烘湰鍗曚綅鎺ユ敹鏁� + FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆 FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛� JArray Fentity2 = new JArray(); @@ -941,7 +943,7 @@ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊 FentityModel2.Add("FCanSale", false); //鍙攢鍞� FentityModel2.Add("FIsMRBReview", false); //MRP璇勫 - FentityModel2.Add("FIsReturn", false); //鍒ら�� + FentityModel2.Add("FIsReturn", true); //鍒ら�� FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇� Fentity2.Add(FentityModel2); FentityModel.Add("FPolicyDetail", Fentity2); @@ -971,6 +973,7 @@ 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_FBaseAcceptQty", HRightQty.ToString()); // FentityModel4.Add("FEntity_Link_FBaseAcceptQtyOld", HRightQty.ToString()); // FentityModel4.Add("FEntity_Link_FBaseInspectQtyOld", HRightQty.ToString()); // FentityModel4.Add("FEntity_Link_FInspectQtyOld", HRightQty.ToString()); // @@ -1126,6 +1129,7 @@ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁¢噺鍗曚綅鍐呯爜 FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲� FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺 + FentityModel.Add("FUnqualifiedQty", HBadQty.ToString());// 涓嶅悎鏍兼暟閲� FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋� FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵�� FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇� @@ -1133,7 +1137,7 @@ FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅 FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲� //FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟� - FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 + //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱 FentityModel.Add("FInspectTimes", "1"); // 妫�楠屾鏁� FentityModel.Add("FTimeUnit", "24");//鏃堕棿鍗曚綅 FentityModel.Add("FSAMPLEDAMAGEBEARER", "2");//鏍锋湰鐮村潖鎵挎媴鏂� @@ -1153,13 +1157,44 @@ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊 FentityModel2.Add("FCanSale", false); //鍙攢鍞� FentityModel2.Add("FIsMRBReview", false); //MRP璇勫 - FentityModel2.Add("FIsReturn", false); //鍒ら�� + FentityModel2.Add("FIsReturn", true); //鍒ら�� FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇� Fentity2.Add(FentityModel2); FentityModel.Add("FPolicyDetail", Fentity2); + JArray Fentity3 = new JArray(); + JObject FentityModel3 = new JObject(); + FentityModel3.Add("FDetailID", "0");// + FentityModel3.Add("FSrcBillType", "SFC_OperationReport"); //婧愬崟绫诲瀷 + FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //宸ュ簭姹囨姤鍗曞崟鍙� + FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //宸ュ簭姹囨姤鍗曚富ID + FentityModel3.Add("FSrcEntryId", HSLEntryID.ToString()); //宸ュ簭姹囨姤鍗曞瓙ID + FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //宸ュ簭姹囨姤鍗曡鍙� + FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PRD_MO" }); // 鐢熶骇璁㈠崟绫诲瀷 + FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //鐢熶骇璁㈠崟鍗曞彿 + FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //鐢熶骇璁㈠崟涓籌D + FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //鐢熶骇璁㈠崟瀛怚D + 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_OperRpt2Inspect"); //鍗曟嵁杞崲瑙勫垯 + FentityModel4.Add("FEntity_Link_FSTableName", "T_SFC_OPTRPTENTRY"); //宸ュ簭姹囨姤鍗曞瓙琛� + FentityModel4.Add("FEntity_Link_FSBillId", HSLInterID.ToString()); //宸ュ簭姹囨姤鍗曚富ID + FentityModel4.Add("FEntity_Link_FSId", HSLEntryID.ToString()); //宸ュ簭姹囨姤鍗曞瓙ID + FentityModel4.Add("FEntity_Link_FBaseAcceptQty", HRightQty.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); + + //JArray Fentity3 = new JArray(); //JObject FentityModel3 = new JObject(); //FentityModel3.Add("FSrcBillType", "SFC_OperationReport"); //婧愬崟绫诲瀷 -- Gitblit v1.9.1