From 0ce9810f76ceb670fab4482aafa06e8bd80ad22c Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 24 五月 2021 10:10:50 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 248 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 180 insertions(+), 68 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 761dd47..f034796 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -21,9 +21,8 @@
DataSet ds1;
-
/// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ /// test
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -72,75 +71,56 @@
double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ long HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Insert Into Sc_StationInBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
- ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
- ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
- ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
- ",HProcNo,HOrderProcNO" +
- ") " +
- " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
- "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
- ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
- "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
- "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
- ",'" + HProcNo + "','" + HOrderProcNO + "'" +
- ") ");
- ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
- if (ds == null)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0].Rows.Count == 0)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
- //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
- ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
- " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
- " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
- if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
- {
-
- }
- else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
- {
+ ListModels oListModels = new ListModels();
+
+ DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill();
+
+ BillNew.omodel.HInterID = HInterID;
+ BillNew.omodel.HYear = 2011;
+ BillNew.omodel.HPeriod = 1;
+ BillNew.omodel.HBillNo = HBillNo;
+ BillNew.omodel.HICMOBillNo = HICMOBillNo;
+ BillNew.omodel.HICMOInterID = HICMOInterID;
+ BillNew.omodel.HProcExchInterID = HProcExchInterID;
+ BillNew.omodel.HProcExchEntryID = HProcExchEntryID;
+ BillNew.omodel.HProcExchBillNo = HProcExchBillNo;
+ BillNew.omodel.HProcID = HProcID;
+ BillNew.omodel.HMaterID = HMaterID;
+ BillNew.omodel.HStationInTime = DateTime.Now;
+ BillNew.omodel.HEmpID = HEmpID;
+ BillNew.omodel.HSourceID = HSourceID;
+ BillNew.omodel.HGroupID = HGroupID;
+ BillNew.omodel.HICMOQty = HICMOQty;
+ BillNew.omodel.HPlanQty = HPlanQty;
+ BillNew.omodel.HQty = HQty;
+ BillNew.omodel.HPieceQty = HPieceQty;
+ BillNew.omodel.HSourceName = HSourceName;
+ BillNew.omodel.HCenterID = HCenterID;
+
+ BillNew.omodel.HProcNo = HProcNo;
+ BillNew.omodel.HOrderProcNO = HOrderProcNO;
+ bool bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + HBillNo.Trim() + ClsPub.sExeReturnInfo;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
catch (Exception e)
{
@@ -153,6 +133,138 @@
}
}
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ //[Route("Cj_StationInBill/AddBill")]
+ //[HttpPost]
+ //public object AddBill([FromBody] JObject oMain)
+ //{
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // try
+ // {
+ // //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ // string BillType = "3790";
+ // long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ // string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ // int HBillStatus = 0;
+ // string HMaker = list[0].HMaker;//鍒跺崟浜�
+ // int HYear = 2021;
+ // double HPeriod = 1;
+ // string HRemark = list[0].HRemark;//澶囨敞
+ // long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ // string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ // int HProcPlanInterID = 0;
+ // int HProcPlanEntryID = 0;
+ // string HProcPlanBillNo = "";
+ // int HProcExchInterID = 0;
+ // int HProcExchEntryID = 0;
+ // string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ // long HMaterID = list[0].HMaterID;//浜у搧ID
+ // long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ // double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ // double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ // long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ // long HGroupID = list[0].HGroupID;//鐝粍ID
+ // long HDeptID = 0;
+ // long HEmpID = list[0].HEmpID;//鎺ユ敹浜篒D
+ // string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+ // string HAddr = "";
+ // string HBarCodeMaker = "";
+ // long HSupID = 0;
+ // double HQty = list[0].HQty;//鎺ユ敹鏁伴噺
+ // double HPrice = 0;
+ // double HMoney = 0;
+ // double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
+ // string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ // long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ // string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ // string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // //涓昏〃
+ // oCN.RunProc("Insert Into Sc_StationInBillMain " +
+ // "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ // ",HYear,HPeriod,HRemark" +
+ // ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ // ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
+ // ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ // ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
+ // ",HProcNo,HOrderProcNO" +
+ // ") " +
+ // " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ // "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
+ // "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ // ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+ // "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+ // "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
+ // ",'" + HProcNo + "','" + HOrderProcNO + "'" +
+ // ") ");
+ // ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+ // if (ds == null)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // if (ds.Tables[0].Rows.Count == 0)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
+ // //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ // ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
+ // " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ // " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
+ // if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ // {
+
+ // }
+ // else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ // {
+
+ // }
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
/// <summary>
/// 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
///鍙傛暟锛歴tring sql銆�
--
Gitblit v1.9.1