From f77e4196ad4870b713a0c51d874481a372c9201c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 09 十二月 2022 13:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 08f5120..9c247d9 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -220,7 +220,7 @@
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);
+ model.Add("FBillNo", dr1["鍗曟嵁鍙�"].ToString());
JArray Fentity = new JArray();
@@ -260,19 +260,6 @@
FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
- //鎵瑰彿
- //FFLOWID FFLOWLINEID FRULEID FSTABLENAME
- //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
- //涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
- //鎺ㄨ繘璺嚎锛欶Entity_Link_FFlowLineId
- //杞崲瑙勫垯锛欶Entity_Link_FRuleId
- //婧愬崟琛ㄥ唴鐮侊細FEntity_Link_FSTableId
- //婧愬崟琛細FEntity_Link_FSTableName
- //婧愬崟鍐呯爜锛欶Entity_Link_FSBillId
- //婧愬崟鍒嗗綍鍐呯爜锛欶Entity_Link_FSId
- //鍘熷鎼哄甫閲忥細FEntity_Link_FBaseQuaQtyOld
- //淇敼鎼哄甫閲忥細FEntity_Link_FBaseQuaQty
-
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
@@ -439,7 +426,7 @@
model.Add("FOwnerId0", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //
model.Add("FIsEntrust", "false");//
model.Add("FCurrId", new JObject() { ["FNumber"] = "PRE001" }); //
- model.Add("FBillNo", HBillNo);
+ model.Add("FBillNo", BillNo);
JArray Fentity = new JArray();
--
Gitblit v1.9.1