From f490a5667dfcf8884f04d60d437b9c478a7cf345 Mon Sep 17 00:00:00 2001
From: 陈雯静 <1134865194@qq.com>
Date: 星期三, 10 四月 2024 08:56:02 +0800
Subject: [PATCH] 1
---
WebAPI/DLL/ClsSc_ICMOReportBill.cs | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index 7c28d1a..345fc26 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -105,8 +105,8 @@
//鍙嶅啓浜ч噺姹囨姤鍗曪紝璐ㄩ噺姹囨姤鍗曞叧鑱斿瓧娈�,鐢熶骇璁㈠崟鍏宠仈鏁伴噺
Ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_ReverseWriteQty " + omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'," +
- DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + "," + DetailColl[0].HICMOBillNo + ",'" + DetailColl[0].HSourceID + "','" +
- "Edit" + "'," + HBackQty
+ DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + ",'" + DetailColl[0].HICMOBillNo + "','" + DetailColl[0].HSourceID + "','" +
+ "Edit" + "'," + HBackQty + "," + DetailColl[0].HICMOTempID
, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "1")
{
@@ -261,8 +261,8 @@
//鍙嶅啓浜ч噺姹囨姤鍗曪紝璐ㄩ噺姹囨姤鍗曞叧鑱斿瓧娈�,鐢熶骇璁㈠崟鍏宠仈鏁伴噺
ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_ReverseWriteQty " + omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'," +
- DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + "," + DetailColl[0].HICMOBillNo + ",'" + DetailColl[0].HSourceID + "','" +
- "Add" + "'," + 0
+ DetailColl[0].HICMOInterID + "," + DetailColl[0].HICMOEntryID + ",'" + DetailColl[0].HICMOBillNo + "','" + DetailColl[0].HSourceID + "','" +
+ "Add" + "'," + 0 + "," + DetailColl[0].HICMOTempID
, "h_p_Sc_ICMOReportBill_ReverseWriteQty");
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
{
@@ -439,6 +439,7 @@
}
else
{
+ oSystemParameter.ShowBill(ref sReturn);
JObject model = new JObject();
model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillType"]) }); //鍗曟嵁绫诲瀷
model.Add("FDate", Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"])); //鍗曟嵁鏃ユ湡
@@ -446,6 +447,8 @@
model.Add("FBillNo", HBillNo);
JArray Fentity = new JArray();
+ string sErrMsg = "";
+ string sJXCode = "";
foreach (DataRow item in Ds.Tables[1].Rows)
{
JObject FentityModel = new JObject();
@@ -493,8 +496,14 @@
FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//鍩烘湰鍗曚綅瀹屾垚鏁伴噺
FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//瀹屾垚鏁伴噺
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//鎵瑰彿
- FentityModel.Add("FShiftGroupId", new JObject() { ["FNumber"] = item["FShiftGroupId"].ToString() });//鐝粍
- FentityModel.Add("F_UUBK_CZG1", new JObject() { ["FSTAFFNUMBER"] = item["F_UUBK_CZG1"].ToString() });// 鎿嶄綔鍛�
+ //
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ FentityModel.Add("FShiftGroupId", new JObject() { ["FNumber"] = item["FShiftGroupId"].ToString() });//鐝粍
+ FentityModel.Add("F_UUBK_CZG1", new JObject() { ["FSTAFFNUMBER"] = item["F_UUBK_CZG1"].ToString() });// 鎿嶄綔鍛�
+ }
+
+
FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOM鐗堟湰
//sJson_BatchNo +
@@ -573,16 +582,29 @@
//鎻愪氦瀹℃牳
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,
+ };
if (oSystemParameter.omodel.Sc_ICMOReportBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
- result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//鎻愪氦
- result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//瀹℃牳
+ 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")
{
- sReturn = "鐢熶骇姹囨姤鍗曞崟鍙�:" + HBillNo + ",鎻愪氦澶辫触" + result;
+ sReturn = "鐢熶骇姹囨姤鍗曞崟鍙�:" + HBillNo + ",鎻愪氦澶辫触" + result1;
oCn.RollBack();
return false;
+ }
+
+ if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ sReturn = "鐢熶骇姹囨姤鍗曞崟鍙�:" + HBillNo + ",瀹℃牳澶辫触" + result2;
+ oCn.RollBack();
+ return false;
}
}
}
@@ -665,14 +687,14 @@
}
//鍒犻櫎鍗曟嵁
- public virtual bool DeleteBill(Int64 lngBillKey, ref string sReturn)
+ public virtual bool DeleteBill(Int64 lngBillKey, string HBillNo, string procName, string user, ref string sReturn)
{
try
{
oCn.BeginTran();
//鏌ヨ鐢熶骇姹囨姤鍗曡〃鏁伴噺
DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HICMOInterID,b.HICMOEntryID from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
- string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
string HICMOInterID = ds.Tables[0].Rows[0]["HICMOInterID"].ToString();
string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
//
@@ -699,6 +721,24 @@
//鍒犻櫎涓昏〃
DeleteBillMain(lngBillKey);
+ //鍒犻櫎鍚庢帶鍒�==================================================================================
+ string sql2 = "exec " + procName + " " + lngBillKey + ",'" + HBillNo + "','" + user + "'";
+ ds = oCn.RunProcReturn(sql2, procName);
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+
+ sReturn = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ oCn.RollBack();
+ return false;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ sReturn = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ oCn.RollBack();
+ return false;
+ }
+ //==============================================================================================
+
sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
--
Gitblit v1.9.1