From 96fa1feae3bd8888de0b4fdaf9bd2e84866013dd Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 16 十二月 2021 17:00:52 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index e15478b..0c3a0cc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -591,6 +591,7 @@
long HPrintQty = mainList[0].HPrintQty;
string HMouldOWNER = mainList[0].HMouldOWNER;
string HSaveLife = mainList[0].HSaveLife;
+ int HCaveQty = mainList[0].HCaveQty;
int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;
@@ -604,7 +605,7 @@
",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
- ",HPrintQty,HMouldStatus,HWhID,HRoutingID" +
+ ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
@@ -614,7 +615,7 @@
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
- "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+
"," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
") ");
@@ -728,6 +729,7 @@
long HPrintQty = mainList[0].HPrintQty;
string HMouldOWNER = mainList[0].HMouldOWNER;
string HSaveLife = mainList[0].HSaveLife;
+ int HCaveQty = mainList[0].HCaveQty;
int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
@@ -772,6 +774,7 @@
",HSPGroupID=" + HSPGroupID.ToString() +
",HSPID=" + HSPID.ToString() +
",HDesignLife=" + HDesignLife.ToString() +
+ ",HCaveQty="+ HCaveQty.ToString()+
",HUseLife=" + HUseLife.ToString() +
",HLeaveLife=" + HLeaveLife.ToString() +
",HProdQty=" + HProdQty.ToString() +
@@ -895,7 +898,7 @@
/// <returns></returns>
[Route("Gy_Material/InitializeProdInBill")]
[HttpGet]
- public object InitializeProdInBill(long hmainid, string user)
+ public object InitializeProdInBill(long hmainid, string user,string userID)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
@@ -912,14 +915,22 @@
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3801','3801'," + HInterID + ",'" + HBillNo + "',' getdate()'" +
+ " values('3801','3801'," + HInterID + ",'" + HBillNo + "',getdate()" +
", '" + user + "',getdate()" +
", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
") ";
+ string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
+ HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
+ HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
+ HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID+ ",1,'',getdate(),0,'',0,0,'','',"+
+ "0,0,"+dr["HInterID"].ToString()+",0,0,0,"+ dr["HUnitID"].ToString()+",0,"+ dr["HProdQty"].ToString() +","+ dr["HProdQty"].ToString()+",0,"+
+ "0,"+ dr["HDesignLife"].ToString()+","+ dr["HLeaveLife"].ToString() + ","+dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString()+",0,0"
+ + ",0,0,"+ userID + ",0,0,'')");
//涓昏〃
oCN.RunProc(sql);
+ oCN.RunProc(sql1);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -936,6 +947,7 @@
objJsonResult.data = null;
}
return objJsonResult;
+
}
#region [妯″叿妗ｆ瀹℃牳銆佸弽瀹℃牳]
--
Gitblit v1.9.1