From acb137729948d4e3d5e99864338c203d68993b9d Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期五, 27 八月 2021 16:48:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 93 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 9d103f0..88755bc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -511,7 +511,7 @@
[HttpPost]
public object AddBill([FromBody] JObject sMainSub)
{
- var _value = sMainSub["sMainSub"].ToString();
+ var _value = sMainSub["oMain"].ToString();
string msg1 = _value.ToString();
oCN.BeginTran();
//淇濆瓨涓昏〃
@@ -540,12 +540,13 @@
{
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 BillType = "3899";
+ //寰楀埌mainid
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
@@ -556,7 +557,7 @@
string HPICNo = mainList[0].HPICNo;
string HWorkMaterModel = mainList[0].HWorkMaterModel;
long HMaterID = mainList[0].HMaterID;
- long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HMouleTypeID = mainList[0].HMouleTypeID;
long HUnitID = mainList[0].HUnitID;
DateTime HOutComDate = mainList[0].HOutComDate;
string HOutComNo = mainList[0].HOutComNo;
@@ -580,6 +581,7 @@
string HSupNumber = mainList[0].HSupNumber;
long HPrintQty = mainList[0].HPrintQty;
+
//涓昏〃
oCN.RunProc("Insert Into Gy_MouldFileMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
@@ -612,6 +614,7 @@
" values('" + HInterID + "',0,''" +
",0,0,'','',0,0 " +
") ");
+
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -657,18 +660,16 @@
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;
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
@@ -679,7 +680,7 @@
string HPICNo = mainList[0].HPICNo;
string HWorkMaterModel = mainList[0].HWorkMaterModel;
long HMaterID = mainList[0].HMaterID;
- long HMouleTypeID = mainList[0].HMouldTypeID;
+ long HMouleTypeID = mainList[0].HMouleTypeID;
long HUnitID = mainList[0].HUnitID;
DateTime HOutComDate = mainList[0].HOutComDate;
string HOutComNo = mainList[0].HOutComNo;
@@ -710,15 +711,52 @@
//鑻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("UpDate Gy_MouldFileMain set " +
+ " HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + HDate + "'" +
+ ",HYear='" + HYear.ToString() + "'" +
+ ",HPeriod='" + HPeriod.ToString() + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HUpDater='" + HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HMouldNo='" + HMouldNo + "'" +
+ ",HName='" + HName + "'" +
+ ",HModel='" + HModel + "'" +
+ ",HModel2='" + HModel2 + "'" +
+ ",HDiameter='" + HDiameter + "'" +
+ ",HSubjoin='" + HSubjoin + "'" +
+ ",HSubjoin2='" + HSubjoin2 + "'" +
+ ",HPICNo='" + HPICNo + "'" +
+ ",HWorkMaterModel='" + HWorkMaterModel + "'" +
+ ",HMaterID=" + HMaterID.ToString() +
+ ",HMaterNumber='" + HMaterNumber + "'" +
+ ",HMouldType=" + HMouleTypeID.ToString() +
+ ",HUnitID=" + HUnitID.ToString() +
+ ",HOutComDate='" + HOutComDate + "'" +
+ ",HOutComNo='" + HOutComNo + "'" +
+ ",HDeptID=" + HDeptID.ToString() +
+ ",HSupID=" + HSupID.ToString() +
+ ",HSupNumber='" + HSupNumber + "'" +
+ ",HPrintQty=" + HPrintQty.ToString() +
+ ",HMouldStatus='" + HMouldStatus + "'" +
+ ",HWhID=" + HWHID.ToString() +
+ ",HRoutingID=" + HRoutingID.ToString() +
+ ",HBomID=" + HBOMID.ToString() +
+ ",HVersion='" + HVersion + "'" +
+ ",HSPGroupID=" + HSPGroupID.ToString() +
+ ",HSPID=" + HSPID.ToString() +
+ ",HDesignLife=" + HDesignLife.ToString() +
+ ",HUseLife=" + HUseLife.ToString() +
+ ",HLeaveLife=" + HLeaveLife.ToString() +
+ ",HProdQty=" + HProdQty.ToString() +
+ ",HProdWeight=" + HProdWeight.ToString() +
+ " where HInterID=" + HInterID.ToString());
+
//淇敼瀛愰」鐩唬鐮�
//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.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
objJsonResult.code = "1";
@@ -738,6 +776,8 @@
}
}
+
+
/// <summary>
/// 纾ㄥ叿妗ｆ淇敼鎸夐挳鏂规硶
///鍙傛暟锛歴tring sql銆�
@@ -749,7 +789,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where hmainid=" + HInterID, "h_v_Gy_MouldFileList");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -774,12 +814,12 @@
/// </summary>
[Route("Gy_Mould_Edit/Delete_Json")]
[HttpGet]
- public object Delete_Json(long HItemID)
+ public object Delete_Json(long hmainid)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (oBill.DeleteBill(HItemID, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
@@ -800,11 +840,6 @@
}
//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)
{
@@ -812,10 +847,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
- return objJsonResult;
}
+ return objJsonResult;
}
-
- //
}
}
\ No newline at end of file
--
Gitblit v1.9.1