From b2c7f60a602414e506fee1b4b125322e745676b2 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 09 四月 2021 08:27:07 +0800
Subject: [PATCH] 委外工序-保存方法
---
WebAPI/Models/StationEntrustInBill.cs | 2
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 96 ++++++++++++++++----------------
WebAPI/Controllers/WebAPIController.cs | 49 ++++++++++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 6 +-
4 files changed, 101 insertions(+), 52 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index c241315..f8d61c9 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -140,46 +140,46 @@
msg1 = "[" + msg1.ToString() + "]";
List<StationEntrustInBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationEntrustInBill>>(msg1);
- var HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- var HYear = 2021;
- var HPeriod = list[0].HPeriod;//鍗曚环
- var HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- var HBillStatus = 0;
- var HInnerBillNo = list[0].HInnerBillNo;//閫佽揣鍗曞彿
- var HICMOBillNo = list[0].HICMOBillNo;//鐢熶骇璁㈠崟鍙�
- long HICMOInterID = DBUtility.ClsPub.isLong(list[0].HICMOInterID);//鐢熶骇璁㈠崟鍙稩D
- var HProcExchInterID = 0;
- var HProcExchEntryID = 0;
- var HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
- var HProcID = list[0].HProcID;//褰撳墠宸ュ簭
- var HMaterID = list[0].HMaterID;//浜у搧ID
- var HStationInTime = list[0].HStationInTime;//
- var HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
- var HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
- var HGroupID = list[0].HGroupID;//鐝粍ID
- var HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
- var HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
- var HQty = list[0].HQty;//鍙戝嚭鏁伴噺
- var HSupID = list[0].HSupID;//渚涘簲鍟咺D
- var HPieceQty = list[0].HPieceQty;//鍙戝嚭浠舵暟
- var HSourceName = list[0].HSourceName;//
- var HPrice = list[0].HPrice;//鍗曚环
- var HMoney = list[0].HMoney;//閲戦
- var HRemark = list[0].HRemark;//澶囨敞
- var HTaxRate = list[0].HTaxRate;//绋庣巼
- var HProcNo = list[0].HProcNo;//娴佹按鍙�
- var HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
- var HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜
- var HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧
- var HWWWorkOrderBillNo = list[0].HWWWorkOrderBillNo;//濮斿宸ュ崟鍙�
- var HMaker = list[0].HMaker;//鍒跺崟浜�
- var HProcPlanInterID = 0;
- var HProcPlanEntryID = 0;
- var HProcPlanBillNo = "";
- var HDeptID = list[0].HDeptID;//閮ㄩ棬ID
- var HBarCode = list[0].HBarCode;//鏉″舰鐮�
- var HAddr = "";
- var HBarCodeMaker = "";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ int HYear = 2021;
+ double HPeriod = list[0].HPeriod;//鍗曚环
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 0;
+ string HInnerBillNo = list[0].HInnerBillNo;//閫佽揣鍗曞彿
+ string HICMOBillNo = list[0].HICMOBillNo;//鐢熶骇璁㈠崟鍙�
+ long HICMOInterID = list[0].HICMOInterID;//鐢熶骇璁㈠崟鍙稩D
+ int HProcExchInterID = 0;
+ int HProcExchEntryID = 0;
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ DateTime HStationInTime = list[0].HStationInTime;//
+ long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ long HGroupID = list[0].HGroupID;//鐝粍ID
+ double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ double HQty = list[0].HQty;//鍙戝嚭鏁伴噺
+ long HSupID = list[0].HSupID;//渚涘簲鍟咺D
+ double HPieceQty = list[0].HPieceQty;//鍙戝嚭浠舵暟
+ string HSourceName = list[0].HSourceName;//
+ double HPrice = list[0].HPrice;//鍗曚环
+ double HMoney = list[0].HMoney;//閲戦
+ string HRemark = list[0].HRemark;//澶囨敞
+ double HTaxRate = list[0].HTaxRate;//绋庣巼
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ int HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜
+ int HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧
+ string HWWWorkOrderBillNo = list[0].HWWWorkOrderBillNo;//濮斿宸ュ崟鍙�
+ string HMaker = list[0].HMaker;//鍒跺崟浜�
+ int HProcPlanInterID = 0;
+ int HProcPlanEntryID = 0;
+ string HProcPlanBillNo = "";
+ long HDeptID = list[0].HDeptID;//閮ㄩ棬ID
+ string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+ string HAddr = "";
+ string HBarCodeMaker = "";
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -193,15 +193,15 @@
",HSupID,HTaxRate,HQty,HPrice,HMoney,HPieceQty" +
",HProcNo,HOrderProcNO,HWWWorkOrderBillNo,HWWWorkOrderInterID,HWWWorkOrderEntryID" +
") " +
- " values('3792','3792'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",getdate(),'" + HMaker + "',getdate()" +
- "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HInnerBillNo + "'" +
- "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'," + HProcExchInterID.ToString() + "," + HProcExchEntryID.ToString() +
- ",'" + HProcExchBillNo + "'," + HMaterID.ToString() + "," + HProcID.ToString() + "," + HICMOQty.ToString() + "," + HPlanQty.ToString() + ",getdate()," + HSourceID.ToString() +
- "," + HGroupID.ToString() + "," + HDeptID.ToString() + "," + HEmpID.ToString() + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
- "," + HSupID.ToString() + "," + HTaxRate.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HMoney.ToString() + "," + HPieceQty.ToString() +
- "," + HProcNo.ToString() + ",'" + HOrderProcNO.ToString() + "'" + ",'" + HWWWorkOrderBillNo.ToString() + "'" + "," + HWWWorkOrderInterID.ToString() + "" + "," + HWWWorkOrderEntryID.ToString() + "" +
+ " values('3792','3792'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillStatus.ToString() + "',getdate(),'" + HMaker + "',getdate()" +
+ ",'" + HYear.ToString() + "','" + HPeriod.ToString() + "','" + HRemark + "','" + HInnerBillNo + "'" +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+ "," + HSupID + "," + HTaxRate + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty +
+ ",'" + HProcNo + "','" + HOrderProcNO + "'" + ",'" + HWWWorkOrderBillNo + "'" + "," + HWWWorkOrderInterID + "" + "," + HWWWorkOrderEntryID + "" +
") ");
- ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID.ToString() + "", "h_p_MES_StationInBill_QtyCtrl");
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
if (ds == null)
{
oCN.RollBack();
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index a50a8aa..28dd8da 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -855,6 +855,55 @@
}
/// <summary>
+ /// 鑾峰彇宸ュ簭鍒楄〃
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/GetProcList_Json")]
+ [HttpGet]
+ public object GetProcList_Json(string sWhere)
+ {
+ DataSet ds;
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (sWhere != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 宸ュ簭浠ｇ爜,HName 宸ュ簭 from Gy_Process where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Process");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇褰撳墠鏁版嵁搴撳悕
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Models/StationEntrustInBill.cs b/WebAPI/Models/StationEntrustInBill.cs
index ffc3f1e..0043101 100644
--- a/WebAPI/Models/StationEntrustInBill.cs
+++ b/WebAPI/Models/StationEntrustInBill.cs
@@ -32,7 +32,7 @@
public double HPrice { get; set; }
public double HMoney { get; set; }
public string HRemark { get; set; }
- public string HTaxRate { get; set; }
+ public double HTaxRate { get; set; }
public string HProcNo { get; set; }
public string HOrderProcNO { get; set; }
public long HWWWorkOrderInterID { get; set; }
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index d458f9b..9c17191 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -163,10 +163,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/08/2021 08:55:08</publishTime>
+ <publishTime>04/08/2021 15:31:05</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/08/2021 08:55:08</publishTime>
+ <publishTime>04/08/2021 15:31:05</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -340,7 +340,7 @@
<publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/08/2021 08:55:12</publishTime>
+ <publishTime>04/08/2021 15:31:28</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1