From 2148a6167e10dfd99e143fbf509be96f2bc8e369 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 21 二月 2024 10:56:28 +0800
Subject: [PATCH] 新增扫描班组条码调用方法，新增生产汇报单上传方法，新增生产汇报、委外入库扫描源单条码调用方法
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 1211 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,162 insertions(+), 49 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 95da203..8085b07 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -16,7 +16,7 @@
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
-
+ public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
@@ -141,10 +141,10 @@
}
#endregion
- #region 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇鏉＄爜淇℃伅2锛堝澶栧伐搴忔帴鏀躲�佸伐搴忚繘绔欐帴鏀堕�氱敤锛�
+ #region 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇鏉＄爜淇℃伅2
[Route("Cj_StationBill/txtHBarCode_KeyDown2")]
[HttpGet]
- public object txtHBarCode_KeyDown2(string HBarCode,string HInterID,string UserID)
+ public object txtHBarCode_KeyDown2(string HBarCode,string HInterID,string UserID,string HBillType)
{
try
{
@@ -164,12 +164,53 @@
NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
sBillBarCode = NewBarCode[0];
}
- string sBillNo = sBillBarCode;
- //鎴彇鏉＄爜绫诲瀷
- string BillNoType = sBillNo.Substring(0, Math.Min(3, sBillNo.Length));
- //鎴彇鍐呯爜
- string BillNo = sBillNo.Substring(3, Math.Min(sBillNo.Length - 3,sBillNo.Length));
+ string sBillNo = sBillBarCode; //鏉″舰鐮�
+ string[] arr = sBillNo.Split('&'); //浠ョ鍙封��&鈥欏垎鍓叉潯褰㈢爜
+ string BillNo_PGD = arr[0]; //鍗曟嵁鍙�
+ string entryid_PGD = "";//瀛恑d
+ if(arr.Length > 1)
+ {
+ entryid_PGD = arr[1];
+ }
+
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄笁浣�
+ string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
+ //鎴彇鏉＄爜绫诲瀷2 鍓嶅洓浣�
+ string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
+ //鎴彇鍐呯爜
+ string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));
+ switch (BillNoType2)
+ {
+ case "GXLZ"://宸ュ簭娴佽浆娲惧伐
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcExchSendWorkBill where 娲惧伐鍗曟嵁鍙� = '" + BillNo_PGD + "'" + " and HEntryID ='" + entryid_PGD + "'", "h_v_Sc_ProcExchSendWorkBill");
+ break;
+ case "GXLX"://娴佽浆鍗�
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ { //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
+ {
+ ds = oCN.RunProcReturn($"exec h_p_ProcessExchangeBillLastHProNo '{BillNo_PGD}','{UserID}','{HBillType}'", "h_v_Gy_ProcessList_GetProcNoByUser");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ else if (entryid_PGD != "") //濡傛灉瀛恑d涓嶄负绌哄垯鍔犲叆瀛恑d杩囨护锛�
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'" + " and hsubid ='" + entryid_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ break;
+ }
switch (BillNoType)
//寰楀埌淇℃伅
{
@@ -204,24 +245,37 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
- if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
+ if(HBillType == "In")
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 = '" + UserID + "'", "h_v_Gy_ProcessList_GetProcNoByUser");
+ //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 = '" + UserID + "'" + " order by 搴忓彿 asc", "h_v_Gy_ProcessList_GetProcNoByUser");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNo where HItemID = '" + BillNo + "' and HInterID = '" +
+ HInterID + "'" + " order by 搴忓彿 asc", "h_v_Gy_ProcessList_GetProcNo");
+ }
}
- else
+ else if(HBillType == "Out")
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNo where HItemID = '" + BillNo + "' and HInterID = '" +
- HInterID + "'", "h_v_Gy_ProcessList_GetProcNo");
+ //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ if (oSystemParameter.omodel.MES_StationOutBill_ShowUSERProcess == "Y")
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 = '" + UserID + "'" + " order by 搴忓彿 asc", "h_v_Gy_ProcessList_GetProcNoByUser");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNo where HItemID = '" + BillNo + "' and HInterID = '" +
+ HInterID + "'" + " order by 搴忓彿 asc", "h_v_Gy_ProcessList_GetProcNo");
+ }
}
}
break;
case "WLM"://鐗╂枡鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList where HItemID = '" + BillNo + "'", "h_v_Gy_MaterialList");
- break;
- case "GXL"://娴佽浆鍗�
- ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
- break;
+ break;
}
//鍐欏叆淇℃伅
@@ -262,62 +316,921 @@
}
#endregion
+ #region 鎸囧紩鍗℃壂鐮佽幏鍙栦俊鎭�
+ [Route("MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown")]
+ [HttpGet]
+ public object SampleRecordBillHBarCode_KeyDown(string HBarCode, string HInterID, string UserID, string HBillType)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎷嗗垎鏉″舰鐮�
+ string sBillBarCode = HBarCode.Trim();
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode; //鏉″舰鐮�
+
+ string[] arr = sBillNo.Split('&'); //浠ョ鍙封��&鈥欏垎鍓叉潯褰㈢爜
+ string BillNo_PGD = arr[0]; //鍗曟嵁鍙�
+ string entryid_PGD = "";//瀛恑d
+ if (arr.Length > 1)
+ {
+ entryid_PGD = arr[1];
+ }
+
+
+ //鎴彇鏉＄爜绫诲瀷2 鍓嶅洓浣�
+ string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
+
+ switch (BillNoType2)
+ {
+ case "GXLX"://娴佽浆鍗�
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ { //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ break;
+ default:
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜閿欒!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ objJsonResult.code = "1";
+ 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 璇曟牱璁板綍 鏌ヨ鍒楄〃
+ [Route("MES_SampleRecordBill_PDA/SampleRecordList")]
+ [HttpGet]
+ public object SampleRecordList(string sWhere,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_QC_TestSampleCheckBillList where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_QC_TestSampleCheckBillList");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璇曟牱璁板綍鏂板淇濆瓨
+ [Route("MES_SampleRecordBill_PDA/SampleRecordAddBill")]
+ [HttpPost]
+ public object SampleRecordAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.ClsQC_TestSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_TestSampleCheckBillMain>>(msg2);
+ string BillType = "7510";
+ string HBillSubType = "7510";
+ string eventType = list[0].eventType;
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
+ long HLastResult = list[0].HLastResult;//璇曟牱缁撹
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo =="")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var num = 0;
+
+ oCN.BeginTran();
+ if ("Add".Equals(eventType))
+ {
+ num = 1;
+
+ ds = oCN.RunProcReturn("select * from QC_TestSampleCheckBillMain where HBillNo='" + HBillNo + "'", "QC_TestSampleCheckBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Insert Into QC_TestSampleCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HUnitID" +
+ ",HPRDORGID,HLastResult)" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'," + HUnitID +
+ "," + HPRDORGID + ",'" + HLastResult + "') ");
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ 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("MES_SampleRecordBill_PDA/CheckSampleRecordBill")]
+ [HttpGet]
+ public object CheckSampleRecordBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ BillOld.MvarItemKey = "QC_TestSampleCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ 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("MES_SampleRecordBill_PDA/DelSampleRecordBill")]
+ [HttpGet]
+ public object DelSampleRecordBill(Int64 lngBillKey, string user)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "QC_TestSampleCheckBill_Detete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from QC_TestSampleCheckBillMain where HInterID=" + lngBillKey, "QC_TestSampleCheckBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from QC_TestSampleCheckBillMain where HInterID=" + lngBillKey);
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ 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("ColorRecord/ColorRecordList")]
+ [HttpGet]
+ public object ColorRecordList(string sWhere,string user)
+ {
+ try
+ {
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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 = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀵硅壊璁板綍鏂板淇濆瓨
+ [Route("MES_SampleRecordBill_PDA/ColorRecordAddBill")]
+ [HttpPost]
+ public object ColorRecordAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+ string msg_entry = sArray[3].ToString(); //鏄庣粏琛屼俊鎭�
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();
+
+ List<Model.ClsQC_FirstPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2);
+ string BillType = "7505";
+ string HBillSubType = "7505";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HICMOEntryID = list[0].HICMOEntryID;//浠诲姟鍗曞瓙ID
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ //long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
+ bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+
+ //琛ㄤ綋鏁版嵁
+ List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg_entry);
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ if (subList.ToArray().Length >= 0)
+ {
+ Model.ClsQC_FirstPieceCheckBillSub oSub = new Model.ClsQC_FirstPieceCheckBillSub();
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
+ oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
+ oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType);
+ oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+ oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
+ oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
+ oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ //oSub.HProcCheckTime = HDate;
+ //oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ //oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ oSub.HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID);
+ oSub.HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty);
+ oSub.HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty);
+ oSub.HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty);
+ oSub.HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty);
+ oSub.HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty);
+ oSub.HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID);
+ oSub.HInspectVal = DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
+ oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
+ oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
+ oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
+ oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
+ oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
+ oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
+ oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
+ oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "true" ? 1 : 0);
+
+ BillNew.DetailColl.Add(oSub);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var num = 0;
+
+ oCN.BeginTran();
+ if (OperationType=="1")
+ {
+ num = 1;
+
+ ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HBillNo='" + HBillNo + "'", "QC_FirstPieceCheckBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
+ ",HPRDORGID,HLastResult)" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
+ "," + HPRDORGID + ",'" + HLastResult + "') ");
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
+ {
+ oCN.RunProc("Insert into QC_FirstPieceCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID" +
+ ",HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ") values("
+ + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HICMOInterID.ToString() +
+ "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HResult + "'" +
+ ",'" + oSub.HStatus +
+ "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ") ");
+ }
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ 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("ColorRecord/CheckColorRecordBill")]
+ [HttpGet]
+ public object CheckColorRecordBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ BillOld.MvarItemKey = "QC_FirstPieceCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ 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("ColorRecord/DelColorRecordBill")]
+ [HttpGet]
+ public object DelColorRecordBill(Int64 lngBillKey, string user)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "QC_FirstPieceCheckBill_Delete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HInterID=" + lngBillKey, "QC_FirstPieceCheckBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from QC_FirstPieceCheckBillMain where HInterID=" + lngBillKey);
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ 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("Sc_StationInBill/autoGetProcNo")]
[HttpGet]
- public object autoGetProcNo(string HUserID, string HInterID)
+ public object autoGetProcNo(string HUserID, string HInterID, string BillType)
{
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- //绯荤粺鍙傛暟鏄惁涓鸿嚜鍔ㄥ尮閰嶆祦姘村彿,N涓烘墜鍔ㄨ緭鍏ワ紝Y涓鸿嚜鍔ㄥ尮閰�
- if (oSystemParameter.omodel.MES_StationOutBill_ShowUSERProcess == "Y")
+ if(BillType == "In")//宸ュ簭杩涚珯鎺ユ敹鍗�
{
- try
+ //绯荤粺鍙傛暟鏄惁涓鸿嚜鍔ㄥ尮閰嶆祦姘村彿,N涓烘墜鍔ㄨ緭鍏ワ紝Y涓鸿嚜鍔ㄥ尮閰�
+ if (oSystemParameter.omodel.MES_StationInBill_AutoFindSNO == "Y")
{
- if (HUserID == null || HUserID.Equals(""))
+ try
+ {
+ if (HUserID == null || HUserID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_StationBill_autoGetProcNo where HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 ='" + HUserID + "'" + " and 绱杩涚珯鏁伴噺 < 璁″垝鏁伴噺 and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 order by 搴忓彿 asc", "h_v_Sc_StationBill_autoGetProcNo");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
+ objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
- //寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select * from h_v_Sc_StationBill_autoGetProcNo where HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 ='" + HUserID + "'", "h_v_Sc_StationBill_autoGetProcNo");
- //鍐欏叆淇℃伅
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
}
- catch (Exception e)
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
+ objJsonResult.Message = "鎵嬪姩杈撳叆妯″紡";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ else if(BillType == "Out")//宸ュ簭鍑虹珯姹囨姤鍗�
+ {
+ //绯荤粺鍙傛暟鏄惁涓鸿嚜鍔ㄥ尮閰嶆祦姘村彿,N涓烘墜鍔ㄨ緭鍏ワ紝Y涓鸿嚜鍔ㄥ尮閰�
+ if (oSystemParameter.omodel.MES_StationOutBill_AutoFindSNO == "Y")
+ {
+ try
+ {
+ if (HUserID == null || HUserID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢ㄦ埛缂栫爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_StationBill_autoGetProcNo where HInterID = '" + HInterID + "' and 鐢ㄦ埛缂栫爜 ='" + HUserID + "'" + " and 绱鍑虹珯鏁伴噺 < 璁″垝鏁伴噺 and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 order by 搴忓彿 asc", "h_v_Sc_StationBill_autoGetProcNo");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌宸ュ簭淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ 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;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵嬪姩杈撳叆妯″紡";
+ objJsonResult.data = "";
return objJsonResult;
}
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎵嬪姩杈撳叆妯″紡";
- objJsonResult.data = "";
- return objJsonResult;
+ return 0;
}
-
}
else
{
@@ -329,6 +1242,99 @@
}
+ }
+ #endregion
+
+ #region 鎸囧紩鍗″彉鏇村崟 鏂板淇濆瓨
+ [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
+ [HttpPost]
+ public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲彉鏇存潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2);
+
+ long HSouceID_Original = list[0].HSouceID_Original;
+ long HSouceID_Now = list[0].HSouceID_Now;
+ long HOrgID = list[0].HOrgID;//缁勭粐ID
+ String HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HProcExchInterID = list[0].HProcExchInterID;
+ long HProcExchEntryID = list[0].HProcExchEntryID;
+ String HProcExchBillNo = list[0].HProcExchBillNo;
+ String HBillNo_Note = list[0].HBillNo_Note;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ string HMaker = user;//鍒跺崟浜�
+ string HMakeDate = list[0].HMakeDate;//鍒跺崟鏃ユ湡
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ if (OperationType == "1")
+ {
+ oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " +
+ "(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" +
+ ",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" +
+ " values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID +
+ "," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" );
+
+ oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID);
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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;
+ }
}
#endregion
@@ -1024,6 +2030,113 @@
}
#endregion
+
+ #region 宸ュ簭濮斿鍙戝嚭鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Cj_StationEntrustInBill/CloseCj_StationEntrustInBill")]
+ [HttpGet]
+ public object CloseCj_StationEntrustInBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Sc_StationInBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶉渶瑕佸啀鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽鍏抽棴!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ 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 鏍规嵁id鍒犻櫎濮斿鍙戝嚭鍗�
[Route("Cj_StationEntrustInBill/del_StationEntrustInBill")]
[HttpGet]
--
Gitblit v1.9.1