From 5b6d9876d89219f34a2fda2820b1de752d28d77e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 08 四月 2025 11:05:24 +0800
Subject: [PATCH] 物料：增加 制单人
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 749 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 602 insertions(+), 147 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 43bedb9..e2268f6 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -52,7 +52,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.Message = "[0000-1-065]瀹屽伐鍗曟棤缂栬緫鏉冮檺!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -63,7 +63,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.Message = "[0000-1-065]鍑虹珯鍗曟棤缂栬緫鏉冮檺!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -77,6 +77,7 @@
long HMainInterID = 0;
HMainInterID = list[0].HMainInterID;
string eventType = list[0].eventType;
+ string HDate = list[0].HDate;
string BillType = "3791";
string HBillSubType = "3791";
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -151,7 +152,7 @@
double HLossQty = list[0].HLossQty;//閬楀け鏁伴噺
double HBackWorkByMaterQty = list[0].HBackWorkByMaterQty;//閬楀け鏁伴噺
int HMouldID = list[0].HMouldID;//妯″叿id
-
+ double HMachineWorkTimes = list[0].HMachineWorkTimes;//璁惧宸ユ椂
LogService.Write($"1.瀛楁璧嬪�硷紝鐢ㄦ椂" + sw.Elapsed );
//鍗曟嵁瀹屾暣鎬у垽鏂�
@@ -159,7 +160,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.Message = "[3791-2-005]娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
objJsonResult.data = null;
return objJsonResult;
}
@@ -167,7 +168,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅";
+ objJsonResult.Message = "[0000-2-032]娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅";
objJsonResult.data = null;
return objJsonResult;
}
@@ -175,7 +176,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佹按鍙锋病鏈夐�夋嫨锛�";
+ objJsonResult.Message = "[0000-2-032]娴佹按鍙锋病鏈夐�夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -183,7 +184,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娴佽浆鍗″彿娌℃湁閫夋嫨锛�";
+ objJsonResult.Message = "[0000-2-032]娴佽浆鍗″彿娌℃湁閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -191,7 +192,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "浜у搧娌℃湁閫夋嫨锛�";
+ objJsonResult.Message = "[0000-2-007]浜у搧娌℃湁閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -208,7 +209,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠宸ュ簭娌℃湁閫夋嫨锛�";
+ objJsonResult.Message = "[0000-2-011]褰撳墠宸ュ簭娌℃湁閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -225,14 +226,20 @@
string Ret = "";
if (oSystemParameter.ShowBill(ref Ret))
{
+ //鍒ゆ柇瀹㈡埛涓轰箶涓�
+ if(oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+ HDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ }
+
//鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�") //绯荤粺鍙傛暟
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟
{
if (HSourceID == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ objJsonResult.Message = "[0000-2-006]鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -248,7 +255,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ objJsonResult.Message = "[0000-2-030]鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -261,7 +268,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ objJsonResult.Message = "[0000-2-030]鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -273,7 +280,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍚堟牸鏁伴噺鍔犳姤搴熸暟閲忓姞涓嶈壇鏁伴噺涓嶈兘涓�0锛�";
+ objJsonResult.Message = "[3791-2-006]鍚堟牸鏁伴噺鍔犳姤搴熸暟閲忓姞涓嶈壇鏁伴噺涓嶈兘涓�0锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -286,7 +293,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠宸ュ崟涓嶆槸寮�宸ョ姸鎬佷笉鑳芥眹鎶ワ紒";
+ objJsonResult.Message = "[3791-2-007]褰撳墠宸ュ崟涓嶆槸寮�宸ョ姸鎬佷笉鑳芥眹鎶ワ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -296,7 +303,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍚堟牸鏁伴噺鍔犳姤搴熸暟閲忎笉鑳戒负0锛�";
+ objJsonResult.Message = "[3791-2-008]鍚堟牸鏁伴噺鍔犳姤搴熸暟閲忎笉鑳戒负0锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -366,7 +373,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.Message = "[0000-2-012]淇濆瓨鍓嶅垽鏂け璐ワ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -374,7 +381,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -391,7 +398,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.Message = "[0000-2-013]鍗曟嵁鍙烽噸澶嶏紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -406,9 +413,9 @@
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
- ",HToCheckQty,HLossQty,HBackWorkByMaterQty,HMouldID" +
+ ",HToCheckQty,HLossQty,HBackWorkByMaterQty,HMouldID,HMachineWorkTimes " +
") " +
- " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
+ " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",'"+ HDate + "','" + HMaker + "',getdate(),'" + HMouldNum + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
@@ -417,7 +424,7 @@
"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HWasterQty_Work + "," + HWasterQty_Mater + "," + HBackWorkQty +
- "," + HShiftsID + "," + HToCheckQty + "," + HLossQty + ","+ HBackWorkByMaterQty + "," + HMouldID + ") ");
+ "," + HShiftsID + "," + HToCheckQty + "," + HLossQty + ","+ HBackWorkByMaterQty + "," + HMouldID + ",'" + HMachineWorkTimes + "') ");
LogService.Write($"4.鏂板缁撴潫锛岀敤鏃�" + sw.Elapsed);
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
@@ -443,6 +450,8 @@
",HSourceID4=" + HSourceID4 +
",HSourceID5=" + HSourceID5 +
",HPayProcID=" + HPayProcID +
+ ",HGroupID=" + HGroupID +
+ ",HShiftsID=" + HShiftsID +
",HWorkTimes=" + HWorkTimes +
",HSaveBillFlag=0 " +
",HBadCount=" + HBadCount +
@@ -460,9 +469,9 @@
",HWasterQty_Work=" + HWasterQty_Work +
",HWasterQty_Mater=" + HWasterQty_Mater +
",HBackWorkQty=" + HBackWorkQty +
- ",HShiftsID=" + HShiftsID +
",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
",HMouldID=" + HMouldID +
+ ",HMachineWorkTimes=" + HMachineWorkTimes +
" where HInterID=" + HInterID);
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
@@ -473,7 +482,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.Message = "[0000-2-014]鎿嶄綔绫诲瀷鏃犳晥锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -486,7 +495,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.Message = "[0000-2-015]鍒ゆ柇鏁伴噺澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -496,7 +505,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.Message = "[0000-2-015]鍒ゆ柇鏁伴噺澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -506,7 +515,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.Message = "[0000-2-015]鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -581,7 +590,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ objJsonResult.Message = "[0000-2-016]淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
objJsonResult.data = null;
return objJsonResult;
@@ -591,7 +600,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -603,6 +612,10 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
+ if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ object objResult = set_CheckBill(HInterID.ToString(), user, HBillSubType);
+ }
if (oSystemParameter.omodel.MES_StationOutBill_SaveAutoAddnew == "Y") //绯荤粺鍙傛暟 椤甸潰淇濆瓨鑷姩鍙樻垚鏂板鐘舵��
{
objJsonResult.Verify = "Y";
@@ -615,9 +628,30 @@
sw.Stop();//缁撴潫璁℃椂
LogService.Write($"11.鍙傛暟鏌ヨ缁撴潫,鏂板缁撴潫锛岀敤鏃�" + sw.Elapsed);
LogService.Write("END--鍑虹珯鍗曟嵁淇濆瓨缁撴潫锛屽嚭绔欏崟鍙凤細" + HBillNo);
+
+ //娴嬭瘯璇彞===========================================================================================================
+ string msg_str = "";
+ string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
+ "from Sc_ProcessExchangeBillMain as a " +
+ "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+ "where a.HInterID = " + HProcExchInterID;
+ DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
+ if (ds_str.Tables[0].Rows.Count > 0)
+ {
+ msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
+ for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
+ {
+ msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
+ }
+ }
+
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭鍑虹珯鍗曟嵁锛�" + HBillNo + "[宸ュ簭娴佽浆鍗″彿锛�" + HProcExchBillNo + "]" + msg_str + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鎴栦慨鏀瑰崟鎹�'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //==============================================================================================================
+
+
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-050]鏂板鍗曟嵁鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -627,7 +661,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-051]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1625,7 +1659,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.Message = "[0000-1-068]瀹屽伐鍗曟棤鏌ヨ鏉冮檺!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1636,7 +1670,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.Message = "[0000-1-068]鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1657,7 +1691,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�!";
+ objJsonResult.Message = "[0000-1-069]娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1691,7 +1725,7 @@
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
@@ -1709,38 +1743,81 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
- [Route("Cj_StationOutBill/page")]
+ #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�-鍒嗛〉
+ [Route("Cj_StationOutBill/get_Display_byPage")]
[HttpGet]
- public json page(string sWhere, string user, int page, int size)
+ public object get_Display_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
{
- json res = new json();
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
- {
- res.code = "0";
- res.count = 0;
- res.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
- res.data = null;
- return res;
- }
- if (sWhere == null || sWhere.Equals(""))
+ if (HBillSubType == "SUB")
{
- ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList");
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-068]瀹屽伐鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
- ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList");
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-068]鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓�
+ string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "宸ュ簭姹囨姤鍗曞垪琛�");
+
+ if (sql_splice == "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-069]娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ sWhere += sql_splice;
+ }
+ }
+ }
+
+ //sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList");
}
//娣诲姞鍒楀悕
@@ -1751,23 +1828,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- res.code = CodeConstant.SUCCEED;
- res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
- res.Message = "Sucess锛�";
- res.list = columnNameList;
- res.data = ds.Tables[0];
- return res;
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = "Exception锛�" + e.ToString();
- res.data = null;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
+ objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
+
#region 宸ュ簭鍑虹珯姹囨姤鍗� 瀛愯〃鏌ヨ
[Route("Cj_StationOutBill/get_SubDisplay")]
[HttpGet]
@@ -1793,7 +1871,10 @@
case "Emp":
sql = "select * from h_v_Sc_StationOutBillSubQuery_Emp where 1 = 1 and HInterID=" + sWhere;
break;
-
+ case "Sup":
+ sql = "select * from h_v_Sc_StationOutBillSubQuery_Sup where 1 = 1 and HInterID=" + sWhere;
+ break;
+
}
ds = oCN.RunProcReturn(sql, TableName);
@@ -1809,7 +1890,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
@@ -1818,7 +1899,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1872,7 +1953,7 @@
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 = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
//string path = @"D:\\Files\\"+ HBillNo;
dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
@@ -1928,7 +2009,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/"+ HBillNo+"/"+ filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo+"/"+ filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -1951,7 +2032,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -1992,7 +2073,7 @@
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 = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
//string path = @"D:\\Files\\"+ HBillNo;
dynamic dyResult = UpLoadFile1(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
@@ -2048,7 +2129,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2071,7 +2152,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2121,7 +2202,7 @@
[HttpGet]
public object Filelist(string HBillNo)
{
- var url = fileip + "/files/" + HBillNo+"/";
+ var url = fileip + "/files/Cj_StationOutBill/" + HBillNo+"/";
//@"C:\\files\\"
try
{
@@ -2156,7 +2237,7 @@
{
oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
- string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/" + HSourceBillNo), HFileName);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HSourceBillNo), HFileName);
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -2191,7 +2272,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曟棤鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-058]瀹屽伐鍗曟棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2202,7 +2283,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曟棤鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-058]鍑虹珯鍗曟棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2220,7 +2301,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.Message = "[0000-1-011]鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2236,7 +2317,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.Message = "[0000-2-018]鍒ゆ柇鍏宠仈澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2244,7 +2325,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "[0000-1-007]" + Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -2252,7 +2333,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[0000-1-013]鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2263,7 +2344,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[3791-1-002]绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2273,7 +2354,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鍑虹珯姹囨姤鍗曞彂鐢熷紓甯革紝娌℃湁浠讳綍杩斿洖璁板綍锛�";
+ objJsonResult.Message = "[3791-1-005]鍒犻櫎鍑虹珯姹囨姤鍗曞彂鐢熷紓甯革紝娌℃湁浠讳綍杩斿洖璁板綍锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2283,7 +2364,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = ds.Tables[0].Rows[0]["HRemarkBack"].ToString();
+ objJsonResult.Message = "[0000-1-007]" + ds.Tables[0].Rows[0]["HRemarkBack"].ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2297,7 +2378,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.Message = "[0000-1-006]鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2306,7 +2387,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2316,7 +2397,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-007]" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2328,7 +2409,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2337,7 +2418,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒帮紒";
+ objJsonResult.Message = "[0000-1-005]鍗曟嵁鏈壘鍒帮紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2347,7 +2428,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-007]寮傚父锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2369,7 +2450,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曟棤鏉冮檺锛�";
+ objJsonResult.Message = "[3791-1-001]瀹屽伐鍗曟棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2381,7 +2462,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曟棤鏉冮檺锛�";
+ objJsonResult.Message = "[3791-1-001]鍑虹珯鍗曟棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2399,7 +2480,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.Message = "[0000-1-011]鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2415,7 +2496,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.Message = "[0000-2-018]鍒ゆ柇鍏宠仈澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2423,7 +2504,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "[0000-1-007]" + Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -2431,7 +2512,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[0000-1-013]鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2442,7 +2523,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "[3791-1-002]绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2465,7 +2546,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2474,7 +2555,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒帮紒";
+ objJsonResult.Message = "[0000-1-005]鍗曟嵁鏈壘鍒帮紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2484,7 +2565,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-007]寮傚父锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2569,7 +2650,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.Message = "[0000-2-018]鍒ゆ柇鍏宠仈澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2577,7 +2658,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "[0000-1-038]" + Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -2585,7 +2666,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -2594,7 +2675,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2615,7 +2696,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.Message = "[0000-1-060]瀹屽伐鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2626,7 +2707,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ objJsonResult.Message = "[0000-1-060]鍑虹珯鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2643,7 +2724,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�"+(i+1)+"琛�:鍗曟嵁ID涓�0锛屼笉鑳藉鏍革紒";
+ objJsonResult.Message = "[0000-1-009]绗�" + (i+1)+"琛�:鍗曟嵁ID涓�0锛屼笉鑳藉鏍革紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2654,7 +2735,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳";
+ objJsonResult.Message = "[0000-1-023]绗�" + (i + 1) + "琛�:鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2664,7 +2745,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-005]绗�" + (i + 1) + "琛�:鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2673,14 +2754,14 @@
int j = 0;
for (int i = 0; i < HInterIDs.Length; i++)
{
- //瀹℃牳鍓嶆帶鍒�
+ //瀹℃牳鍓嶆帶鍒�================================================================================
string sql = "exec h_p_Sc_StationOutBill_BeforeCheckCtrl " + HInterIDs[i] + ",'" + HBillNo[i] + "','" + CurUserName + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_BeforeCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.Message = "[0000-1-024]瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2689,11 +2770,11 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[0000-1-025]瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
}
-
+ //================================================================================
//瀹℃牳
if (Cj_StationOutBillCheckBill(long.Parse(HInterIDs[i]), HBillNo[i], CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
@@ -2704,7 +2785,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎴愬姛:" + j + "琛�,绗�" + (i + 1) + "琛�:瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-025]鎴愬姛:" + j + "琛�,绗�" + (i + 1) + "琛�:瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2712,7 +2793,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍏ㄩ儴鎵ц鎴愬姛!";
+ objJsonResult.Message = "[0000-1-029]鍏ㄩ儴鎵ц鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2720,7 +2801,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-025]瀹℃牳澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -2769,7 +2850,7 @@
LogService.Write("鍑虹珯鍗曟嵁瀹℃牳鏇存敼娴佽浆鍗℃暟閲�,娴佽浆鍗�:" + HProcExchBillNo + ",鍑虹珯鍗曞彿锛�" + HBillNo + ",鍘熸祦杞崱鏁伴噺:" + HProcExchQty + ",鏂版祦杞崱鏁伴噺:" + HQty);
}
- //瀹℃牳鍚庢帶鍒�
+ //瀹℃牳鍚庢帶鍒�================================================================================
string sql = "exec h_p_Sc_StationOutBill_AfterCheckCtrl " + lngBillKey + ",'" + HBillNo + "','" + CurUserName + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_AfterCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
@@ -2784,7 +2865,7 @@
oCN.RollBack();
return false;
}
-
+ //================================================================================
sReturn = sReturn + " 瀹℃牳鍔熻兘锛�";
oCN.Commit();
@@ -2813,7 +2894,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-061]瀹屽伐鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2825,7 +2906,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.Message = "[0000-1-061]鍑虹珯鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2846,7 +2927,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:鍗曟嵁ID涓�0锛屼笉鑳藉弽瀹℃牳锛�";
+ objJsonResult.Message = "[0000-1-009]绗�" + (i + 1) + "琛�:鍗曟嵁ID涓�0锛屼笉鑳藉弽瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2858,7 +2939,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.Message = "[0000-1-018]绗�" + (i + 1) + "琛�:鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2870,7 +2951,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:瀹℃牳浜哄拰鍙嶅鏍镐汉涓嶄竴鑷�!";
+ objJsonResult.Message = "[0000-1-062]绗�" + (i + 1) + "琛�:瀹℃牳浜哄拰鍙嶅鏍镐汉涓嶄竴鑷�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2882,7 +2963,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1) + "琛�:鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-005]绗�" + (i + 1) + "琛�:鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2891,14 +2972,14 @@
int j = 0;
for (int i = 0; i < HInterIDs.Length; i++)
{
- //鍙嶅鏍稿墠鎺у埗
+ //鍙嶅鏍稿墠鎺у埗=============================================================
string sql = "exec h_p_Sc_StationOutBill_BeforeUnCheckCtrl " + HInterIDs[i] + ",'" + HBillNo[i] + "','" + CurUserName + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_BeforeUnCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.Message = "[0000-1-027]鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
objJsonResult.data = null;
return objJsonResult;
@@ -2907,11 +2988,11 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.Message = "[0000-1-028]鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
}
-
+ //================================================================================
//鍙嶅鏍�
if (Cj_StationOutBillAbandonCheckBill(long.Parse(HInterIDs[i]),HBillNo[i], CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -2921,7 +3002,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎴愬姛:" + j + "琛�,绗�" + (i + 1) + "琛�:鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "[0000-1-028]鎴愬姛:" + j + "琛�,绗�" + (i + 1) + "琛�:鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2929,7 +3010,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍏ㄩ儴鎵ц鎴愬姛!";
+ objJsonResult.Message = "[0000-1-019]鍏ㄩ儴鎵ц鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2937,7 +3018,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "[0000-1-028]鍙嶅鏍稿け璐ワ紒" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -3005,7 +3086,7 @@
return false; ;
}
}
-
+ #endregion
#region 宸ュ簭鍑虹珯鍏抽棴/鍙嶅叧闂姛鑳�
[Route("Cj_StationOutBill/CloseCj_StationOutBill")]
@@ -3021,7 +3102,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹屽伐鍗曟棤鏉冮檺鍏抽棴!";
+ objJsonResult.Message = "[0000-1-063]瀹屽伐鍗曟棤鏉冮檺鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3032,7 +3113,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍑虹珯鍗曟棤鏉冮檺鍏抽棴!";
+ objJsonResult.Message = "[0000-1-063]鍑虹珯鍗曟棤鏉冮檺鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3043,7 +3124,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.Message = "[0000-1-009]HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3065,17 +3146,41 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶉渶瑕佸啀鍏抽棴!";
+ objJsonResult.Message = "[0000-1-033]鍗曟嵁宸插叧闂�!涓嶉渶瑕佸啀鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
}
- //鍏抽棴鍗曟嵁
- if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ var HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+
+ //鍏抽棴鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Sc_StationOutBill_BeforeCloseCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sc_StationOutBill_BeforeCloseCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:鍏抽棴鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), HBillNo, "h_p_Sc_StationOutBill_AfterCloseCtrl", user, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-034]鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -3092,17 +3197,41 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.Message = "[0000-1-035]鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
objJsonResult.data = null;
return objJsonResult;
}
}
- //鍙嶅叧闂崟鎹�
- if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ var HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ //鍙嶅叧闂墠鎺у埗=========================================
+ string sql1 = "exec h_p_Sc_StationOutBill_BeforeUnCloseCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sc_StationOutBill_BeforeUnCloseCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:鍙嶅叧闂墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), HBillNo, "h_p_Sc_StationOutBill_AfterUnCloseCtrl", user, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-036]鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -3112,7 +3241,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-064]鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -3121,7 +3250,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-034]鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -3130,7 +3259,7 @@
- //鏄惁琚叧鑱�
+ #region //鏄惁琚叧鑱�
public bool Cj_StationInBillisUse(Int64 lngBillKey, ref string sReturn)
{
try
@@ -3755,7 +3884,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-037]";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -3763,7 +3892,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "";
+ objJsonResult.Message = "[0000-1-010]";
return objJsonResult;
}
@@ -3774,7 +3903,333 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨鐢熸垚鐧芥爣
+ public class WhiteLabelGeneration {
+ public string ProjectNo { get; set; }
+ public string OrderingCode { get; set; }
+ public string DrawVersionNumber { get; set; }
+ public string CustomerOrderNumber { get; set; }
+ public string WaybillNumber { get; set; }
+ public string HRemark { get; set; }
+ public string HBarCode_Pack { get; set; }
+ public string HBillType { get; set; }
+ }
+ [Route("Cj_StationOutBill_Detail/MES_WhiteLabelGeneration")]
+ [HttpPost]
+ public object MES_WhiteLabelGeneration([FromBody] JObject oMain)
+ {
+ try
+ {
+ oCN.BeginTran();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ WhiteLabelGeneration Main = Newtonsoft.Json.JsonConvert.DeserializeObject<WhiteLabelGeneration>(msg2);
+
+ string HBillType = Main.HBillType;
+ string ProjectNo = Main.ProjectNo;
+ string OrderingCode = Main.OrderingCode;
+ string DrawVersionNumber = Main.DrawVersionNumber;
+ string CustomerOrderNumber = Main.CustomerOrderNumber;
+ string WaybillNumber = Main.WaybillNumber;
+ string HRemark = Main.HRemark;
+ string HBarCode_Pack = Main.HBarCode_Pack;
+
+ ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_15 '{HBillType}','{ProjectNo}','{OrderingCode}','{DrawVersionNumber}','{CustomerOrderNumber}','{WaybillNumber}','{HRemark}','{HBarCode_Pack}'", "h_p_MES_HBarCode_White_SMR_15");
+
+ string HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
+
+ if (HBarCode_White == "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鐧芥爣澶辫触,鍗曟嵁鏍囪瘑:" + HBarCode_Pack + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_PackUnionBillMain set HBarCode_White='" + HBarCode_White + "' where HBarCode_Pack='" + HBarCode_Pack + "'");
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 涓嬫帹璐ㄩ噺姹囨姤鍗曟椂杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曚俊鎭�
+ [Route("Cj_StationOutBill/PushDownBackInfo")]
+ [HttpGet]
+ public object PushDownBackInfo(string linterid, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBill_PushDownBackInfo where hmainid in (" + linterid + ")", "h_v_Sc_StationOutBill_PushDownBackInfo");
+
+ if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ {
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭鍑虹珯姹囨姤鍗曚俊鎭�
+ [Route("Cj_StationOutBill/SetBillTime")]
+ [HttpGet]
+ public object SetBillTime(int HInterID,DateTime dateTime,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-065]鍑虹珯鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from Sc_StationOutBillMain with(nolock) where HInterID=" + HInterID;
+ ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-003]淇敼澶辫触娌℃壘鍒扮浉鍏冲嚭绔欐眹鎶ュ崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼鍓嶆椂闂翠慨鏀瑰悗鏃堕棿鍒ゆ柇鏈夋棤宸ヨ祫璁＄畻
+ string HGroupID = ds.Tables[0].Rows[0]["HGroupID"].ToString();
+ string HOldDate = ds.Tables[0].Rows[0]["HDate"].ToString();
+ string sql1 = "select * from Pay_SingleBalBillMain where HGroupID =" +HGroupID + " and HDate ='" + HOldDate + "'";
+ string sql2 = "select * from Pay_GroupBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + HOldDate + "'";
+ string sql3 = "select * from Pay_SingleBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + dateTime + "'";
+ string sql4 = "select * from Pay_GroupBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + dateTime + "'";
+ ds = oCN.RunProcReturn(sql1, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-004]淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + HOldDate;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql2, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-004]淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + HOldDate;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql3, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-004]淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + dateTime;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql4, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-004]淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + dateTime;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼鏃堕棿
+ sql = "update Sc_StationOutBillMain set HDate = '" + dateTime + "' where HInterID = " + HInterID;
+ oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-067]Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-066]Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍑虹珯鍗曞垪琛�-涓嬫帹PPM鏁版嵁褰曞叆淇濆瓨,鍒犻櫎
+
+ [Route("Cj_StationOutBill/PPMSupAddBill")]
+ [HttpPost]
+ public object PPMSupAddBill([FromBody] JObject sSubStr)
+ {
+ var _value = sSubStr["sSubStr"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = sArray[0].ToString(); //琛ㄤ綋
+ string refSav = sArray[1].ToString();//鎿嶄綔绫诲瀷
+ string user = sArray[2].ToString(); //鐢ㄦ埛
+ msg2 = msg2.Substring(1, msg2.Length - 2);
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ msg2 = "[" + msg2 + "]";
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ List<Sc_StationOutBillSub_Sup> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Sc_StationOutBillSub_Sup>>(msg2);
+
+ oCN.BeginTran();
+ for (int i = 0; i < list.Count; i++)
+ {
+ int HInterID = list[i].HInterID;
+ int HEntryID = i+1;
+ int HSupID = list[i].HSupID;
+ double HWasterQty_Mater = list[i].HWasterQty_Mater;
+ double HBackWorkQty = list[i].HBackWorkQty;
+
+ oCN.RunProc("Insert Into Sc_StationOutBillSub_Sup " +
+ "(HInterID, HEntryID, HSupID, HWasterQty_Mater, HBackWorkQty) " +
+ "values ('" + HInterID + "', '" + HEntryID + "', '" + HSupID + "', '" + HWasterQty_Mater + "', '" + HBackWorkQty + "')");
+
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("Cj_StationOutBill/PPMSupDelete")]
+ [HttpGet]
+ public object PPMSupDelete(int HInterID,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-058]鏃犲垹闄ゆ潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_Sup WITH(NOLOCK) where HInterID = " + HInterID, "Sc_StationOutBillSub_Sup");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ }
+
+ oCN.BeginTran();
+
+ string sql = "";
+
+ sql = "delete from Sc_StationOutBillSub_Sup where HInterID = " + HInterID;
+ oCN.RunProc(sql);
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1