From 722b6aa81bfcc1801e0868e0c94931644659d5a1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十一月 2024 16:55:37 +0800
Subject: [PATCH] 墨西哥白标报表 墨西哥白标生成
---
WebAPI/Controllers/ReportController.cs | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/ReportController.cs b/WebAPI/Controllers/ReportController.cs
index 1c27082..dc8be48 100644
--- a/WebAPI/Controllers/ReportController.cs
+++ b/WebAPI/Controllers/ReportController.cs
@@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.Diagnostics;
using System.Web.Http;
using WebAPI.Models;
@@ -168,19 +169,34 @@
{
try
{
+ Stopwatch sw = new Stopwatch();
+
//鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
HBillNo = "9010-" + HBillNo;
+
+ LogService.Write("鐢熶骇姹囨姤鍗�:" + HBillNo);
+
+ sw.Start();//寮�濮嬭鏃�
+
//鑾峰彇缁勭粐浠ｇ爜
string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
+
+ LogService.Write("1-鏌ヨ锛岀敤鏃�" + sw.Elapsed);
+
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
DataRow dr = ds.Tables[0].Rows[0];
+ LogService.Write("2-鏌ヨ锛岀敤鏃�" + sw.Elapsed);
+
//淇濆瓨
oCN.BeginTran();
- DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
+ DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HMainSourceBillNo='{BillNo}'", "Sc_ICMOReportBillMain");
+
+ LogService.Write("3-鏌ヨ锛岀敤鏃�" + sw.Elapsed);
+
if (DsTable.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
@@ -219,10 +235,16 @@
",0,0,''" +
"," + dr["HICMOInterID"].ToString() + ",'" + dr["浠诲姟鍗�"].ToString() + "',''" +
") ");
+
+ LogService.Write("4-鏂板锛岀敤鏃�" + sw.Elapsed);
+
//鍚屾閲戣澏
//璁块棶閲戣澏
var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+
+ LogService.Write("5-璁块棶閲戣澏锛岀敤鏃�" + sw.Elapsed);
+
if (isSuccess == 0)
{
objJsonResult.code = "0";
@@ -231,6 +253,8 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ LogService.Write("6-鎵惧埌閲戣澏鐨勭敓浜ц鍗曪紝鐢ㄦ椂" + sw.Elapsed);
//鏍规嵁浠诲姟鍗曟煡鎵惧埌閲戣澏鐨勭敓浜ц鍗�
DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc_SMR where 鍗曟嵁鍙�='" + dr["鍗曟嵁鍙�"].ToString()+"'" , "h_v_TOERP_StationOutBillList_LastProc_SMR");
@@ -244,6 +268,8 @@
return objJsonResult;
}
DataRow dr1 = ds1.Tables[0].Rows[0];
+
+ LogService.Write("7-寮�濮嬫柊澧為噾铦朵簯鍗曟嵁锛岀敤鏃�" + sw.Elapsed);
JObject model = new JObject();
model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
@@ -273,7 +299,7 @@
FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
- FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
+ //FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
FentityModel.Add("FFailQty", item["涓嶈壇鏁伴噺"].ToString());//涓嶅悎鏍兼暟閲�
FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 鍏ュ簱缁勭粐
FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
@@ -281,10 +307,12 @@
FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
- FentityModel.Add("FBomId", new JObject() { ["F number"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ 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("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "True" ? true : false);// 鍊掑啿棰嗘枡
+ FentityModel.Add("FCHECKPRODUCT", dr1["HCHECKPRODUCT"].ToString() == "True" ? true : false);// 浜у搧妫�楠�
FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
+ //FentityModel.Add("FSRCENTRYSEQ", dr1["HSEQ"].ToString());//婧愬崟琛屽彿
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
//FentityModel.Add("F_RCZU_LZKH", dr1["宸ュ簭娴佽浆鍗″彿"].ToString());// 宸ュ簭娴佽浆鍗�
JArray Fentity2 = new JArray();
@@ -316,6 +344,9 @@
};
string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+
+ LogService.Write("8-淇濆瓨缁撴灉锛岀敤鏃�" + sw.Elapsed);
+
//鍒ゆ柇淇濆瓨鏄惁鎴愬姛
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
@@ -327,29 +358,40 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ LogService.Write("9-寮�濮嬪鏍革紝鐢ㄦ椂" + sw.Elapsed);
+
//鎻愪氦瀹℃牳
- string result1 = string.Empty;
- string result2 = string.Empty;
- var fID = JObject.Parse(result)["Result"]["Id"].ToString();
- var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
- var json = new
- {
- Ids = fID,
- };
- result1 = InvokeHelper.Submit("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();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //string result1 = string.Empty;
+ //string result2 = string.Empty;
+ //var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ //var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ //var json = new
+ //{
+ // Ids = fID,
+ //};
+ //result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
+ //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
+
+ //LogService.Write("10-瀹℃牳缁撴灉锛岀敤鏃�" + sw.Elapsed);
+
+ //if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ LogService.Write("11-淇敼瀹屾垚锛岀敤鏃�" + sw.Elapsed);
+
+ sw.Stop();//缁撴潫璁℃椂
+ LogService.Write("12-鎬荤敤鏃�" + sw.Elapsed);
+
oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1