From 29b9f853dcfb14e0157050a48e8c2d110cbf3022 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 09 三月 2023 19:55:25 +0800
Subject: [PATCH] 客户_收货方联系人
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 467 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 367 insertions(+), 100 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 40e2f6f..9412611 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -99,7 +100,7 @@
double HMoney = 0;
double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -115,6 +116,7 @@
double HPriceRate = list[0].HPriceRate;//绯绘暟
double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+ long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HProcExchInterID <= 0)
{
@@ -132,7 +134,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HProcNo <= 0)
+ if (HProcNo == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -156,14 +158,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HGroupID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HGroupID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HProcID == 0)
{
@@ -213,6 +215,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
//if (HWorkTimes <= 0)
//{
// objJsonResult.code = "0";
@@ -253,10 +256,13 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ var num = 0;
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
if ("Add".Equals(eventType))
{
+ num = 1;
if (!AllowbillNo(HBillNo))
{
oCN.RollBack();
@@ -274,7 +280,7 @@
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
- ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
") " +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -283,11 +289,12 @@
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
- "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID +
+ "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
") ");
}
else if ("Modify".Equals(eventType))
{
+ num = 2;
oCN.RunProc("UpDate Sc_StationOutBillMain set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
@@ -356,7 +363,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
@@ -392,6 +399,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -428,7 +436,9 @@
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();
+ string msg5 = sArray[3].ToString();
+
List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
msg1 = msg1.Replace("\\", "");
@@ -436,102 +446,163 @@
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 = DateTime.Now.Year;
+ oBill.omodel.HPeriod = DateTime.Now.Month;
+ 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 = true;
+ 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;
+ oBill.omodel.HMaker = msg4;
+ oBill.omodel.HEmpNum = msg5;
- 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;
- }
-
+ oCN.RunProc($"update Sc_StationOutBillMain set HMaker='{msg4}' where HInterID={oBill.omodel.HInterID}");
+ 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)
{
@@ -641,6 +712,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
{
@@ -662,11 +734,20 @@
ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
}
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
//}
@@ -844,6 +925,126 @@
return Result_Ob;
}
+
+
+
+
+ [Route("Cj_StationOutBill/UploadFile2")]
+ [HttpPost]
+ public object UploadFile2()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
+ //string path = @"D:\\Files\\"+ HBillNo;
+ dynamic dyResult = UpLoadFile1(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UpLoadFile1(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + fileurl.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
/// <summary>
/// 杈撳嚭json缁撴灉 杩斿洖2涓�� result (杈撳嚭succes鐨勫��) returnval (杈撳嚭str鐨勫��)
/// </summary>
@@ -1019,6 +1220,72 @@
}
#endregion
+ #region 鏍规嵁鍗曟嵁鍙� 鍚屾鎶ラ敊鍒犻櫎鍑虹珯鍗�
+ [Route("Cj_StationOutBill/DelStationOutBill")]
+ [HttpGet]
+ public object DelStationOutBill(string HInterID)
+ {
+ try
+ {
+ DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ DataTable DTable;
+ int num = 0;
+ //鍒ゆ柇鍏ュ簱鏄惁鍚屾
+ DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HInterID='" + HInterID + "' and HRelationQty=0", "Sc_StationOutBillMain").Tables[0];
+ if (DTable.Rows.Count != 0)
+ {
+ num++;
+ }
+ //鍒ゆ柇鏈鎶ュ簾鏄惁鍚屾
+ DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HProcExchInterID='" + DTable.Rows[0]["HProcExchInterID"].ToString() + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
+ if (DTable.Rows.Count != 0)
+ {
+ num++;
+ }
+
+ if (num == 2)
+ {
+ if (!oBill.DeleteBill(long.Parse(HInterID), 0, 0, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏃犻』鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 缂栬緫鍓嶅垽鏂�
[Route("Cj_StationOutBill/set_ShowBillJudge")]
[HttpGet]
--
Gitblit v1.9.1