From 66350933608690dd01c29c2268c16a2b99835d97 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 02 七月 2021 14:28:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 317 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 4578cc0..04b5522 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -117,6 +117,8 @@
+
+
/// <summary>
/// 杩斿洖妫�鍏锋。妗堝垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -214,6 +216,321 @@
}
+
+ /// <summary>
+ /// 鏂板妯″叿妗ｆ-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Mould_Edit/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
+ string BillType = "7507";
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HMouldNo = mainList[0].HMouldNo;
+ string HName = mainList[0].HName;
+ string HModel = mainList[0].HModel;
+ string HModel2 = mainList[0].HModel2;
+ string HDiameter = mainList[0].HDiameter;
+ string HSubjoin = mainList[0].HSubjoin;
+ string HSubjoin2 = mainList[0].HSubjoin2;
+ string HPICNo = mainList[0].HPICNo;
+ string HWorkMaterModel = mainList[0].HWorkMaterModel;
+ long HMaterID = mainList[0].HMaterID;
+ long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HUnitID = mainList[0].HUnitID;
+ DateTime HOutComDate = mainList[0].HOutComDate;
+ string HOutComNo = mainList[0].HOutComNo;
+ long HDeptID = mainList[0].HDeptID;
+ long HSupID = mainList[0].HSupID;
+ string HMouldStatus = mainList[0].HMouldStatus;
+ long HWHID = mainList[0].HWHID;
+ long HRoutingID = mainList[0].HRoutingID;
+ long HBOMID = mainList[0].HBOMID;
+ string HVersion = mainList[0].HVersion;
+ long HSPGroupID = mainList[0].HSPGroupID;
+ long HSPID = mainList[0].HSPID;
+ Double HDesignLife = mainList[0].HDesignLife;
+ Double HUseLife = mainList[0].HUseLife;
+ Double HLeaveLife = mainList[0].HLeaveLife;
+ Double HProdQty = mainList[0].HProdQty;
+ Double HProdWeight = mainList[0].HProdWeight;
+ string HRemark = mainList[0].HRemark;
+ string HMaker = mainList[0].HMaker;
+ string HMaterNumber = mainList[0].HMaterNumber;
+ string HSupNumber = mainList[0].HSupNumber;
+ long HPrintQty = mainList[0].HPrintQty;
+
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_MouldFileMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMouldNo,HName,HModel,HModel2,HDiameter" +
+ ",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
+ ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
+ ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
+ ",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
+ ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight" +
+ ") " +
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ "," + HSubjoin + ",'" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "'" +
+ ") ");
+
+
+ //瀛愯〃
+ oCN.RunProc("Insert into Gy_MouldFileSub " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") " +
+ " values('" + HInterID + "',0,''" +
+ ",0,0,'','',0,0 " +
+ ") ");
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Mould_Edit/AddBill1")]
+ [HttpPost]
+ public object AddBill1([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ DAL.ClsGy_MouldFile oMould = new DAL.ClsGy_MouldFile();
+ DAL.ClsGy_MouldFileMain_View oDeptHlp = new DAL.ClsGy_MouldFileMain_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
+ string BillType = "7507";
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HMouldNo = mainList[0].HMouldNo;
+ string HName = mainList[0].HName;
+ string HModel = mainList[0].HModel;
+ string HModel2 = mainList[0].HModel2;
+ string HDiameter = mainList[0].HDiameter;
+ string HSubjoin = mainList[0].HSubjoin;
+ string HSubjoin2 = mainList[0].HSubjoin2;
+ string HPICNo = mainList[0].HPICNo;
+ string HWorkMaterModel = mainList[0].HWorkMaterModel;
+ long HMaterID = mainList[0].HMaterID;
+ long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HUnitID = mainList[0].HUnitID;
+ DateTime HOutComDate = mainList[0].HOutComDate;
+ string HOutComNo = mainList[0].HOutComNo;
+ long HDeptID = mainList[0].HDeptID;
+ long HSupID = mainList[0].HSupID;
+ string HMouldStatus = mainList[0].HMouldStatus;
+ long HWHID = mainList[0].HWHID;
+ long HRoutingID = mainList[0].HRoutingID;
+ long HBOMID = mainList[0].HBOMID;
+ string HVersion = mainList[0].HVersion;
+ long HSPGroupID = mainList[0].HSPGroupID;
+ long HSPID = mainList[0].HSPID;
+ Double HDesignLife = mainList[0].HDesignLife;
+ Double HUseLife = mainList[0].HUseLife;
+ Double HLeaveLife = mainList[0].HLeaveLife;
+ Double HProdQty = mainList[0].HProdQty;
+ Double HProdWeight = mainList[0].HProdWeight;
+ string HRemark = mainList[0].HRemark;
+ string HMaker = mainList[0].HMaker;
+ string HMaterNumber = mainList[0].HMaterNumber;
+ string HSupNumber = mainList[0].HSupNumber;
+ long HPrintQty = mainList[0].HPrintQty;
+
+
+
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_MouldFileMain set " +
+ " HMouldNo='" + HMouldNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2= '" + HModel2 + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ // oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 纾ㄥ叿妗ｆ淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Mould_Edit/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 妯″叿妗ｆ鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Mould_Edit/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID)
+ {
+ DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
+ try
+ {
+ if (oBill.DeleteBill(HItemID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
//
}
}
\ No newline at end of file
--
Gitblit v1.9.1