From ae68ef5d4843c8ea0558e607a7f7b97f78b29b79 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 28 十一月 2022 13:10:24 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 174 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 55 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 1f2dd60..a800787 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1,11 +1,14 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
+using RestSharp;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Windows.Forms;
using WebAPI.Models;
using WebAPI.Service;
@@ -20,6 +23,36 @@
DataSet ds;
+
+ ////妫�娴� 褰撳墠閫変腑琛岀殑 椤圭洰鐘舵��
+ //[Route("Gy_Material/CheckUseStatus")]
+ //[HttpGet]
+ //public void Sub_CheckUseStatus(int grd, int IDCol, string sProcName)
+ //{
+ // SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ // Int64 sItemID;
+ // try
+ // {
+ // //寰幆褰撳墠缃戞牸閫変腑椤圭洰
+ // for (int i = 0; i < grd.SelectedRows.Count; i++)
+ // {
+ // //寰楀埌鍐呯爜
+ // sItemID = DBUtility.ClsPub.isLong(grd.Rows[grd.SelectedRows[i].Index].Cells[IDCol].Value);
+ // //璋冪敤鍌ㄥ瓨杩囩▼ h_p_Gy_CheckUseDept
+ // oCn.RunProc("exec " + sProcName + " " + sItemID.ToString(), ref ClsPub.sExeReturnInfo);
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // MessageBox.Show("妫�娴嬮敊璇紒鍘熷洜锛�" + ClsPub.sExeReturnInfo);
+ // //objJsonResult.code = "0";
+ // //objJsonResult.count = 0;
+ // //objJsonResult.Message = "妫�娴嬮敊璇紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ // //objJsonResult.data = null;
+ // //return objJsonResult;
+ // }
+ //}
+
/// <summary>
/// 杩斿洖鐗╂枡鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -27,10 +60,11 @@
/// </summary>
[Route("Gy_Material/list")]
[HttpGet]
- public object list(string sWhere,string user, string Organization)
+ public object list(string sWhere, string user, string Organization)
{
try
{
+ List<object> columnNameList = new List<object>();
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
{
@@ -51,9 +85,18 @@
ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
}
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -89,10 +132,12 @@
{
DataSet ds;
var _value = msg["msg"].ToString();
+ cs(_value);
string msg3 = _value.ToString();
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg1 = sArray[0].ToString();
string msg2 = sArray[1].ToString();
+ string msg_HUSEORGID = sArray[2].ToString();
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -116,7 +161,7 @@
HItemID = maxid;
}
ListModels oListModels = new ListModels();
-
+
try
{
DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
@@ -242,7 +287,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+ oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HEndFlag = true;//鏈骇鏍囧織
oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
@@ -263,7 +308,7 @@
}
if (bResult)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
@@ -297,7 +342,7 @@
/// <returns></returns>
[Route("Gy_Material/Delete")]
[HttpGet]
- public object DeltetGy_Material(string HItemID,string user)
+ public object DeltetGy_Material(string HItemID, string user)
{
DataSet ds;
try
@@ -342,7 +387,7 @@
return objJsonResult;
}
- oCN.RunProc("update Gy_Material set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_Material where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -383,12 +428,12 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by hmainid desc", "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
}
else
{
string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by hmainid desc";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
}
@@ -478,7 +523,7 @@
/// </summary>
[Route("Gy_BarCodeBillList/GetBarCodeBillList")]
[HttpGet]
- public object GetBarCodeBillList(string sWhere,string user)
+ public object GetBarCodeBillList(string sWhere, string user)
{
try
{
@@ -561,27 +606,21 @@
objJsonResult.data = null;
return objJsonResult;
}
- DataSet Ds, Ds2;
+ DataSet Ds;
Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList");
if (Ds.Tables[0].Rows.Count != 0)
{
oCN.BeginTran();
- Ds2 = oCN.RunProcReturn("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString(), "Gy_BarCodeBill");
- if (Ds2.Tables[0].Rows.Count != 0)
- {
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触";
+ oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
+
+
}
else
{
@@ -594,13 +633,14 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = e.Message;
objJsonResult.data = null;
return objJsonResult;
}
-
+
}
#endregion
@@ -662,6 +702,7 @@
int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
+ string HBarCode = mainList[0].HBarCode;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
string HModel2 = mainList[0].HModel2;
@@ -697,8 +738,8 @@
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;
+ int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
+ int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
int HNowSupID = mainList[0].HNowSupID;
int HNowSupTypeID = mainList[0].HNowSupTypeID;
@@ -714,7 +755,7 @@
",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" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
@@ -722,9 +763,9 @@
",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
"," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + 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+"'"+
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'" +
") ");
@@ -802,6 +843,7 @@
int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
+ string HBarCode = mainList[0].HBarCode;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
string HModel2 = mainList[0].HModel2;
@@ -882,16 +924,17 @@
",HSPGroupID=" + HSPGroupID.ToString() +
",HSPID=" + HSPID.ToString() +
",HDesignLife=" + HDesignLife.ToString() +
- ",HCaveQty="+ HCaveQty.ToString()+
+ ",HCaveQty=" + HCaveQty.ToString() +
",HUseLife=" + HUseLife.ToString() +
",HLeaveLife=" + HLeaveLife.ToString() +
",HProdQty=" + HProdQty.ToString() +
- ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
+ ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
",HMouldOWNER='" + HMouldOWNER + "'" +
- ",HNowSupID="+HNowSupID.ToString()+
- ",HNowSupTypeID="+HNowSupTypeID.ToString()+
+ ",HNowSupID=" + HNowSupID.ToString() +
+ ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
",HProdWeight=" + HProdWeight.ToString() +
+ ",HBarCode=" + HBarCode.ToString() +
" where HInterID=" + HInterID.ToString());
//淇敼瀛愰」鐩唬鐮�
@@ -1008,7 +1051,7 @@
/// <returns></returns>
[Route("Gy_Material/InitializeProdInBill")]
[HttpGet]
- public object InitializeProdInBill(long hmainid, string user,string userID)
+ public object InitializeProdInBill(long hmainid, string user, string userID)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
@@ -1028,27 +1071,27 @@
" values('3801','3801'," + HInterID + ",'" + HBillNo + "',getdate()" +
", '" + user + "',getdate()" +
", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',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,'')");
+ 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;
- objJsonResult.Message = "鍒濆鍖栨垚鍔燂紝鍗曟嵁鍙蜂负"+ HBillNo;
+ objJsonResult.Message = "鍒濆鍖栨垚鍔燂紝鍗曟嵁鍙蜂负" + HBillNo;
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
-
+
}
catch (Exception)
{
@@ -1058,7 +1101,7 @@
objJsonResult.data = null;
}
return objJsonResult;
-
+
}
#region [妯″叿妗ｆ瀹℃牳銆佸弽瀹℃牳]
@@ -1214,20 +1257,20 @@
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)-5);
+ string Num = dr["HBarCode"].ToString();
+ string Num1 = Num.Substring(0, (Num.Length) - 5);
oCN.BeginTran();
for (int i = StarNum1; i <= EndNum1; i++)
{
- if (i<10)
+ if (i < 10)
{
- j = "0000" + i;
+ j = "0000" + i;
}
- else if (i<100)
+ else if (i < 100)
{
j = "000" + i;
}
- else if (i<1000)
+ else if (i < 1000)
{
j = "00" + i;
}
@@ -1237,12 +1280,13 @@
}
else
{
- j = ""+i;
+ j = "" + i;
}
- DataSet ds1= oCN.RunProcReturn("select * from Gy_MouldFileMain where hbillno='" + (Num1 + j)+"'", "Gy_MouldFileMain");
+ 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);
+ //string HBillNo = DBUtility.ClsPub.CreateBillCode("3899", ref DBUtility.ClsPub.sExeReturnInfo, true);
string sql = string.Format(@"Insert Into Gy_MouldFileMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" +
@@ -1255,10 +1299,10 @@
",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
") " +
" values('3899','3899'," + HItemID + ",'" + Num1 + j + "',getdate()" +
- "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + dr["HBarCode"] +
+ "," + dr["HYear"] + "," + dr["HPeriod"] + ",'" + dr["HRemark"] + "','" + dr["HMaker"] + "',getdate(),'" + Num1 + j +
"','" + Num1 + j + "','" + dr["HName"] + "','" + dr["HModel"] + "','" + dr["HModel2"] + "','" + dr["HDiameter"] + "'" +
",'" + dr["HSubjoin"] + "','" + dr["HSubjoin2"] + "','" + dr["HPICNo"] + "','" + dr["HWorkMaterModel"] + "'" +
- "," + dr["HMaterID"] + ",'" + dr["HMaterNumber"] + "',0," + 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"] + "'" +
@@ -1298,5 +1342,25 @@
}
}
#endregion
+
+ public void cs(string msg)
+ {
+ var client = new RestSharp.RestClient("http://47.96.97.237/api/");
+ var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialList", Method.POST);
+ Info info = new Info();
+ info.msg = msg;
+ var json = JsonConvert.SerializeObject(info);
+ requestPost.AddParameter("application/json", json, ParameterType.RequestBody);
+ IRestResponse responsePost = client.Execute(requestPost);
+ var contentPost = responsePost.Content;
+ Console.WriteLine("POST鏂瑰紡鑾峰彇缁撴灉锛�" + contentPost);
+ Console.Read();
+ }
+
+ public class Info
+ {
+ public string msg { get; set; } //鏈骇鏍囧織
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1