From 8abaa81478ce8f0ed95f27de22829ef223f2093b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 08 九月 2022 15:26:45 +0800
Subject: [PATCH] 凯贝
---
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache | 2
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 231 +++++++++++++++++++++++++++++-----------------
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 37 +++++++
3 files changed, 183 insertions(+), 87 deletions(-)
diff --git a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
index 5bd3ad3..eb2086c 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f70cb7d7ee8d88a4770a27001295562246dc2e4a
+08bc7f9ad52dac46a486d601aad75ab55bfbf42b
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index c72bd51..5993416 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -428,7 +428,8 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+ string msg4 = sArray[2].ToString();
+
List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
msg1 = msg1.Replace("\\", "");
@@ -436,102 +437,160 @@
ListModels oListModels = new ListModels();
list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2);
int i = 0;
+ int j = 0;
foreach (Model.ClsSc_StationOutBillMain oItemSub in list)
{
+ DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+ j++;
+ oBill.omodel.HInterID = list[i].HInterID;
+ oBill.omodel.HBillNo = msg3 + "- " + j;
+ oBill.omodel.HBillStatus = 0;
+ oBill.omodel.HMouldNum = list[i].HMouldNum;
+ oBill.omodel.HYear = 2022;
+ oBill.omodel.HPeriod = 1;
+ oBill.omodel.HRemark = list[i].HRemark;
+ oBill.omodel.HSourceName = list[i].HSourceName;
+ oBill.omodel.HPieceQty = list[i].HPieceQty;
+ oBill.omodel.HWasterQty = list[i].HWasterQty;
+ oBill.omodel.HPlanPieceQty = list[i].HPlanPieceQty;
+ oBill.omodel.HBadPNL = list[i].HBadPNL;
+ oBill.omodel.HICMOInterID = list[i].HICMOInterID;
+ oBill.omodel.HICMOBillNo = list[i].HICMOBillNo;
+ oBill.omodel.HProcExchInterID = list[i].HProcExchInterID;
+ oBill.omodel.HProcExchEntryID = list[i].HProcExchEntryID;
+ oBill.omodel.HProcExchBillNo = list[i].HProcExchBillNo;
+ oBill.omodel.HMaterID = list[i].HMaterID;
+ oBill.omodel.HProcID = list[i].HProcID;
+ oBill.omodel.HICMOQty = list[i].HICMOQty;
+ oBill.omodel.HPlanQty = list[i].HPlanQty;
+ oBill.omodel.HStationOutTime = list[i].HStationOutTime;
+ oBill.omodel.HSourceID = list[i].HSourceID;
+ oBill.omodel.HPayProcID = list[i].HPayProcID;
+ oBill.omodel.HGroupID = list[i].HGroupID;
+ oBill.omodel.HDeptID = list[i].HDeptID;
+ oBill.omodel.HEmpID = list[i].HEmpID;
+ oBill.omodel.HBarCode = list[i].HBarCode;
+ oBill.omodel.HAddr = list[i].HAddr;
+ //oBill.omodel.HBarCodeMaker = list[i].HBarCodeMaker;
+ oBill.omodel.HBarCodeMaker = msg4;
+ oBill.omodel.HSourceID2 = list[i].HSourceID2;
+ oBill.omodel.HSourceID3 = list[i].HSourceID3;
+ oBill.omodel.HSourceID4 = list[i].HSourceID4;
+ oBill.omodel.HSourceID5 = list[i].HSourceID5;
+ oBill.omodel.HSupID = list[i].HSupID;
+ oBill.omodel.HQty = list[i].HQty;
+ oBill.omodel.HPrice = list[i].HPrice;
+ oBill.omodel.HMoney = list[i].HMoney;
+ oBill.omodel.HBadCount = list[i].HBadCount;
+ oBill.omodel.HCenterID = list[i].HCenterID;
+ oBill.omodel.HProcNo = list[i].HProcNo;
+ oBill.omodel.HOrderProcNO = list[i].HOrderProcNO;
+ oBill.omodel.HSourceNameList = list[i].HSourceNameList;
+ oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
+ oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
+ oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
+ oBill.omodel.HLastSubProc = list[i].HLastSubProc;
+ oBill.omodel.HEmpID2 = list[i].HEmpID2;
+ oBill.omodel.HEmpID3 = list[i].HEmpID3;
+ oBill.omodel.HEmpID4 = list[i].HEmpID4;
+ oBill.omodel.HEmpID5 = list[i].HEmpID5;
+ oBill.omodel.HDSQty = list[i].HDSQty;
+ oBill.omodel.HChongQty = list[i].HChongQty;
+ oBill.omodel.HPriceRate = list[i].HPriceRate;
+ oBill.omodel.HWorkTimes = list[i].HWorkTimes;
+ oBill.omodel.HQCCheckID = list[i].HQCCheckID;
- i++;
- long HMainInterID = 0;
- HMainInterID = list[0].HInterID;
- string eventType = "";
- string BillType = "3791";
- string HBillSubType = "3791";
- long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HBillNo = msg3 + "- " + i;//閫掑叆type寰楀埌鐨勫崟鎹彿
- int HBillStatus = 0;
- string HMaker = list[0].HMaker;//鍒跺崟浜�
- string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
- int HYear = 2021;
- double HPeriod = 1;
- string HRemark = list[0].HRemark;//澶囨敞
- string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
- double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
- double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
- double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
- double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
- long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
- string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
- int HProcPlanInterID = 0;
- int HProcPlanEntryID = 0;
- string HProcPlanBillNo = "";
- long HProcExchInterID = list[0].HProcExchInterID;
- long HProcExchEntryID = list[0].HProcExchEntryID;
- string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
- long HMaterID = list[0].HMaterID;//浜у搧ID
- long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
- double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
- double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
- DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
- long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
- long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID
- long HGroupID = list[0].HGroupID;//鐝粍ID
- long HDeptID = 0;
- long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
- string HBarCode = list[0].HBarCode;//鏉″舰鐮�
- string HAddr = "";
- string HBarCodeMaker = "";
- long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
- long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
- long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
- long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
- long HSupID = 0;
- double HQty = list[0].HQty;//鍚堟牸鏁伴噺
- double HPrice = 0;
- double HMoney = 0;
- double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
- long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
- string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
- string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
- long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
- string HMainSourceBillType = "3790";
- bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
- long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
- long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
- long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
- long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
- double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
- double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
- double HPriceRate = list[0].HPriceRate;//绯绘暟
- double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
- long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+ //string HBillSubType = "3791";
+ //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ //string HBillNo = msg3 + "- " + i;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ //int HBillStatus = 0;
+ //string HMaker = list[0].HMaker;//鍒跺崟浜�
+ //string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
+ //int HYear = 2021;
+ //double HPeriod = 1;
+ //string HRemark = list[0].HRemark;//澶囨敞
+ //string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ //double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
+ //double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
+ //double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
+ //double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
+ //long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ //string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ //int HProcPlanInterID = 0;
+ //int HProcPlanEntryID = 0;
+ //string HProcPlanBillNo = "";
+ //long HProcExchInterID = list[0].HProcExchInterID;
+ //long HProcExchEntryID = list[0].HProcExchEntryID;
+ //string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ //long HMaterID = list[0].HMaterID;//浜у搧ID
+ //long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
+ //double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ //double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
+ //DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
+ //long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ //long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID
+ //long HGroupID = list[0].HGroupID;//鐝粍ID
+ //long HDeptID = 0;
+ //long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
+ //string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+ //string HAddr = "";
+ //string HBarCodeMaker = "";
+ //long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
+ //long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
+ //long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
+ //long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
+ //long HSupID = 0;
+ //double HQty = list[0].HQty;//鍚堟牸鏁伴噺
+ //double HPrice = 0;
+ //double HMoney = 0;
+ //double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
+ //long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ //long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ //string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ //string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
+ //long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ //string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ //string HMainSourceBillType = "3790";
+ //bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
+ //long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
+ //long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
+ //long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
+ //long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
+ //double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
+ //double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
+ //double HPriceRate = list[0].HPriceRate;//绯绘暟
+ //double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
+ //long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- if (bResult)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
- return objJsonResult;
- }
-
+ i++;
+ //if (bResult)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
}
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
return objJsonResult;
-
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index fd02fef..e66f202 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -372,6 +372,43 @@
//}
#endregion
+
+ #region 宸ュ簭娴佽浆鍗″垪琛ㄦ樉绀哄櫒鍏锋竻鍗曚俊鎭�
+ [Route("Sc_ProcessExchangeBillList/QJQD")]
+ [HttpGet]
+ public object QJQD(Int64 HProcExchHinteID)
+ {
+ try
+ {
+
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuerySub_Mould where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鍑虹珯鍗曟槑缁嗕俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region[杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚]
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
--
Gitblit v1.9.1