From 4c7cb8434be52f1de8557c069ebf82dfbfd8d6ee Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 05 十一月 2025 15:29:46 +0800
Subject: [PATCH] 增加凯贝装箱单
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 165 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index 498150e..fc32f70 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -2050,22 +2050,17 @@
return objJsonResult;
}
- DataSet ds2 = oCN.RunProcReturn("exec h_p_Kf_CheckSellOutBill_BalanceQuery " + HInterID, "h_p_Kf_CheckSellOutBill_BalanceQuery");
+ DataSet ds2 = oCN.RunProcReturn("exec h_p_Kf_CheckSellOutBill_CrediControl " + HInterID, "h_p_Kf_CheckSellOutBill_BalanceQuery");
- if ((int)ds2.Tables[0].Rows[0]["HBack"] == 1)
+ if (ds2 == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = ds2.Tables[0].Rows[0]["HRemark"].ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
+ throw new Exception("鏃犺繑鍥炲��!");
+ }else
{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds2.Tables[1];
+ objJsonResult.data = ds2.Tables[0];
return objJsonResult;
}
}
@@ -2358,5 +2353,165 @@
}
}
#endregion
+
+
+ #region 閿�鍞嚭搴� 鏍规嵁閿�鍞鍗曚富id鏌ヨ鏉＄爜鏄庣粏
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <returns></returns>
+ [Route("Kf_SellOutBill/GetBarCode_Detail")]
+ [HttpGet]
+ public object GetBarCode_Detail(string HInterID)
+ {
+ try
+ {
+ List<object> columnNameListSum = new List<object>();
+ List<object> columnNameList0 = new List<object>();
+ List<object> columnNameList1 = new List<object>();
+
+ string sql = "exec h_p_Kf_SellOutBillBarCodeNote_Detail '" + HInterID+"'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutBillBarCodeNote_Detail");
+
+ //娣诲姞 姹囨�讳俊鎭� 鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 鏉＄爜鏄庣粏 鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ columnNameListSum.Add(columnNameList0);
+ columnNameListSum.Add(columnNameList1);
+
+ List<DataTable> tableList = new List<DataTable>();
+ tableList.Add(ds.Tables[0]);
+ tableList.Add(ds.Tables[1]);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = tableList;
+ objJsonResult.list = columnNameListSum;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region [閿�鍞嚭搴撳崟鍚屾鎻掍欢]
+ [Route("Kf_SellOutBill/SaveKf_SellOutBillApi")]
+ [HttpPost]
+ public object SaveKf_SellOutBillApi([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ LogService.Write("閿�鍞嚭搴撳崟鍚屾锛�" + sMainSub.ToString());
+ var model = sMainSub["model"].ToString();
+ var entry = sMainSub["model"]["HENTRY"].ToString();
+
+ model = "[" + model.ToString() + "]";
+ List<Model.ClsKf_SellOutBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_SellOutBillMain>>(model);
+ List< Model.ClsKf_SellOutBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List< Model.ClsKf_SellOutBillSub>> (entry);
+ string sql = string.Empty;
+
+ oCN.BeginTran();
+ // 鍒ゆ柇 鏁版嵁搴撲腑鏄惁瀛樺湪id鍜屽崟鎹彿鐩哥瓑鐨勬墦鍗曟嵁锛屽瓨鍦紝鍒欓噸寤猴紝鍙湁id鍙风浉绛夛紝鍒欑敵璇锋柊鐨刬d鍙�
+ var ds1 = oCN.RunProcReturn($@"select HInterID,HBillNO from Kf_ICStockBillMain where HInterID= {mainList[0].HInterID}", "Kf_ICStockBillMain");
+ var HInterID_Old = mainList[0].HInterID;
+ if (ds1.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows[0]["HInterID"] != null)
+ {
+ if (string.Equals(ds1.Tables[0].Rows[0]["HBillNo"].ToString(), mainList[0].HBillNo, StringComparison.OrdinalIgnoreCase))
+ {
+ sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ // 閲嶆柊鐢宠HInterID
+ var HInterID_Exch = DBUtility.ClsPub.CreateBillID("1205", ref DBUtility.ClsPub.sExeReturnInfo);
+ mainList[0].HInterID = HInterID_Exch;
+
+ foreach (var oSub in subList)
+ {
+ oSub.HInterID = HInterID_Exch;
+ }
+
+ }
+ }
+ //涓昏〃
+ sql = @"insert into Kf_ICStockBillMain
+ (HInterID, HYear, HPeriod, HBillNo, HBillType, HBillSubType, HMainSourceBillType, HDate,
+ HSupID, HWHID, HSCWHID, HEmpID, HManagerID, HSecManagerID, HKeeperID, HDeptID,
+ HCurID, HSeOrderBillNo, HExplanation, HRemark, HInnerBillNo, HRedBlueFlag, HBillStatus, HMaker,
+ HMakeDate, HChecker, HCheckDate, HUpDater, HUpDateDate, HDeleteMan, HDeleteDate, HOWNERID,
+ HOWNERTYPEID, HERPInterID, HERPBillType, HERPBillNo, HPRDORGID, HSTOCKORGID)
+ values(" + mainList[0].HInterID + ", " + mainList[0].HYear + ", " + mainList[0].HPeriod + ", '" + mainList[0].HBillNo + "', '" + mainList[0].HBillType + "', '" + mainList[0].HBillSubType + "', '" + mainList[0].HMainSourceBillType + "', '" + mainList[0].HDate + "'" +
+ "," + mainList[0].HSupID + ", " + mainList[0].HWHID + ", " + mainList[0].HSCWHID + ", " + mainList[0].HEmpID + ", " + mainList[0].HManagerID + ", " + mainList[0].HSecManagerID + ", " + mainList[0].HKeeperID + ", " + mainList[0].HDeptID + "" +
+ "," + mainList[0].HCurID + ", '" + mainList[0].HSeOrderBillNo + "', '" + mainList[0].HExplanation + "', '" + mainList[0].HRemark + "', '" + mainList[0].HInnerBillNo + "', '" + mainList[0].HRedBlueFlag + "', " + mainList[0].HBillStatus + ", '" + mainList[0].HMaker + "'" +
+ ",'" + mainList[0].HMakeDate + "', '" + mainList[0].HChecker + "', '" + mainList[0].HCheckDate + "', '" + mainList[0].HUpDater + "', '" + mainList[0].HUpDateDate + "', '" + mainList[0].HDeleteMan + "', '" + mainList[0].HDeleteDate + "', " + mainList[0].HOWNERID + "" +
+ ",'" + mainList[0].HOWNERTYPEID + "', " + mainList[0].HERPInterID + ", '" + mainList[0].HERPBillType + "', '" + mainList[0].HERPBillNo + "', " + mainList[0].HPRDORGID + ", " + mainList[0].HSTOCKORGID + ")";
+ LogService.Write("閿�鍞嚭搴撳崟涓昏〃鍚屾锛�" + sql);
+ oCN.RunProc(sql);
+ //淇濆瓨瀛愯〃
+ foreach (var oSub in subList)
+ {
+ sql = $@"insert into Kf_ICStockBillSub
+ (HInterID, HEntryID, HMTONo, HPlanMode, HRemark, HExpressNumber, HMaterID, HUnitID,
+ HBatchNo, HPropertyID, HWHID, HSPID, HSCWHID, HSCSPID, HQtyMust, HQty,
+ HPrice, HMoney, HTaxPrice, HTaxRate, HTaxMoney, HRelationQty, HRelationMoney, HSourceInterID,
+ HSourceEntryID, HSourceBillNo, HSourceBillType, HERPInterID, HERPEntryID, HERPBillNo_Sub, HPOOrderInterID, HPOOrderEntryID,
+ HPOOrderBillNo, HSeOrderInterID, HSeOrderEntryID, HSeOrderBillNo, HICMOInterID, HICMOEntryID,
+ HICMOBillNo, HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo, HProduceDate, HExpiryDate, HOWNERID, HOWNERTYPEID,
+ HKEEPERID, HKEEPERTYPEID)
+ values('{mainList[0].HInterID }', '{oSub.HEntryID}', '{oSub.HMTONo}', '{oSub.HPlanMode}', '{oSub.HRemark}', '{oSub.HExpressNumber}', '{oSub.HMaterID}', '{oSub.HUnitID}',
+ '{oSub.HBatchNo}', '{oSub.HPropertyID}', '{oSub.HWHID}', '{oSub.HSPID}', '{oSub.HSCWHID}', '{oSub.HSCSPID}', '{oSub.HQtyMust}', '{oSub.HQty}',
+ '{oSub.HPrice}', '{oSub.HMoney}', '{oSub.HTaxPrice}', '{oSub.HTaxRate}', '{oSub.HTaxMoney}', '{oSub.HRelationQty}', '{oSub.HRelationMoney}', '{oSub.HSourceInterID}',
+ '{oSub.HSourceEntryID}', '{oSub.HSourceBillNo}', '{oSub.HSourceBillType}', '{oSub.HERPInterID}', '{oSub.HERPEntryID}', '{oSub.HERPBillNo_Sub}', '{oSub.HPOOrderInterID}', '{oSub.HPOOrderEntryID}',
+ '{oSub.HPOOrderBillNo}', '{oSub.HSeOrderInterID}', '{oSub.HSeOrderEntryID}', '{oSub.HSeOrderBillNo}', '{oSub.HICMOInterID}', '{oSub.HICMOEntryID}',
+ '{oSub.HICMOBillNo}', '{oSub.HWWOrderInterID}', '{oSub.HWWOrderEntryID}', '{oSub.HWWOrderBillNo}', '{oSub.HProduceDate}', '{oSub.HExpiryDate}', '{oSub.HOWNERID}', '{oSub.HOWNERTYPEID}',
+ '{oSub.HKEEPERID}', '{oSub.HKEEPERTYPEID}')";
+ LogService.Write("閿�鍞嚭搴撳崟瀛愯〃鍚屾锛�" + sql);
+ oCN.RunProc(sql);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ LogService.Write("閿�鍞嚭搴撳崟鍚屾寮傚父,淇濆瓨鏂规硶鎵ц瀹屾垚寮傚父锛�" + e.Message.ToString());
+
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1