From 98ffd76b42337f3455982adbf384d648f8fef8bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 21 四月 2022 21:08:20 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 3f5cc87..1f2dd60 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1207,17 +1207,39 @@
{
int StarNum1 = int.Parse(StarNum);
int EndNum1 = int.Parse(EndNum);
+ string j;
+ List<object> list = new List<object>();
try
{
DataSet ds = new DataSet();
ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
DataRow dr = ds.Tables[0].Rows[0];
string Num = dr["HBillNo"].ToString();
- string Num1 = Num.Substring(0,(Num.Length)-3);
+ string Num1 = Num.Substring(0,(Num.Length)-5);
oCN.BeginTran();
for (int i = StarNum1; i <= EndNum1; i++)
{
- DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + i)+"'", "Gy_MouldFileMain");
+ if (i<10)
+ {
+ j = "0000" + i;
+ }
+ else if (i<100)
+ {
+ j = "000" + i;
+ }
+ else if (i<1000)
+ {
+ j = "00" + i;
+ }
+ else if (i < 10000)
+ {
+ j = "0" + i;
+ }
+ else
+ {
+ j = ""+i;
+ }
+ DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j)+"'", "Gy_MouldFileMain");
if (ds1.Tables[0].Rows.Count == 0 || ds1 == null)
{
long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1226,17 +1248,17 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" +
",HMouldNo,HName,HModel,HModel2,HDiameter" +
",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
- ",HMaterID,HMaterNumber,HUnitID" +
+ ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
- " values('3899','3899'," + HItemID + ",'" + Num1 + i + "',getdate()" +
- "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + i +
- "','" + dr["HMouldNo"] + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
+ " values('3899','3899'," + HItemID + ",'" + Num1 + j + "',getdate()" +
+ "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + dr["HBarCode"] +
+ "','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
- "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "'," + dr["HUnitID"] +
+ "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + dr["HUnitID"] +
",'" + dr["HOutComDate"] + "','" + dr["HOutComNo"] + "'," + dr["HDeptID"] + "," + dr["HSupID"] + ",'" + dr["HSupNumber"] + "'" +
"," + dr["HPrintQty"] + ",'" + dr["HMouldStatus"] + "'," + dr["HWHID"] + "," + dr["HRoutingID"] + ",'" + dr["HCaveQty"] +
"'," + dr["HBOMID"] + ",'" + dr["HVersion"] + "'," + dr["HSPGroupID"] + "," + dr["HSPID"] + ",'" + dr["HDesignLife"] + "','" + dr["HNowSupID"] + "','" + dr["HNowSupTypeID"] + "'" +
@@ -1253,12 +1275,16 @@
",0,0,'','',0,0 " +
") ");
}
+ else
+ {
+ list.Add(ds1.Tables[0].Rows[0]["HBillNo"].ToString());
+ }
}
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎵归噺鐢熸垚鎴愬姛锛�";
- objJsonResult.data = null;
+ objJsonResult.list = list;
return objJsonResult;
}
catch (Exception e)
--
Gitblit v1.9.1