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 |   84 ++++++++++++++++++++++++++---------------
 1 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 8c07c4e..a800787 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1,6 +1,7 @@
 锘縰sing Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Pub_Class;
+using RestSharp;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -59,7 +60,7 @@
         /// </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
             {
@@ -131,6 +132,7 @@
         {
             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();
@@ -159,7 +161,7 @@
                 HItemID = maxid;
             }
             ListModels oListModels = new ListModels();
-            
+
             try
             {
                 DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
@@ -306,7 +308,7 @@
                 }
                 if (bResult)
                 {
-                    objJsonResult.code = "0";
+                    objJsonResult.code = "1";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
                     //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
@@ -340,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
@@ -521,7 +523,7 @@
         /// </summary>
         [Route("Gy_BarCodeBillList/GetBarCodeBillList")]
         [HttpGet]
-        public object GetBarCodeBillList(string sWhere,string user)
+        public object GetBarCodeBillList(string sWhere, string user)
         {
             try
             {
@@ -608,8 +610,8 @@
                 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();
-                   oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());
+                    oCN.BeginTran();
+                    oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());
 
                     oCN.Commit();
                     objJsonResult.code = "1";
@@ -638,7 +640,7 @@
                 objJsonResult.data = null;
                 return objJsonResult;
             }
-            
+
         }
         #endregion
 
@@ -736,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;
 
@@ -761,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+"','"+ HBarCode+"'"+
+                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'" +
                 ") ");
 
 
@@ -932,7 +934,7 @@
                 ",HNowSupID=" + HNowSupID.ToString() +
                 ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
                 ",HProdWeight=" + HProdWeight.ToString() +
-                ",HBarCode="+ HBarCode.ToString()+
+                ",HBarCode=" + HBarCode.ToString() +
                 " where HInterID=" + HInterID.ToString());
 
                 //淇敼瀛愰」鐩唬鐮�
@@ -1049,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
@@ -1069,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)
             {
@@ -1099,7 +1101,7 @@
                 objJsonResult.data = null;
             }
             return objJsonResult;
-        
+
         }
 
         #region [妯″叿妗f瀹℃牳銆佸弽瀹℃牳]
@@ -1256,19 +1258,19 @@
                 ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain");
                 DataRow dr = ds.Tables[0].Rows[0];
                 string Num = dr["HBarCode"].ToString();
-                string Num1 = Num.Substring(0,(Num.Length)-5);
+                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;
                     }
@@ -1278,9 +1280,9 @@
                     }
                     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);
@@ -1300,7 +1302,7 @@
                         "," + 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"] + "'" +
@@ -1340,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