From 525b0a300d7294fe0256b9e99a9168b85ef24308 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 25 十二月 2024 16:18:05 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 206 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 15577f4..b2cc2e5 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -174,12 +174,28 @@
entryid_PGD = arr[1];
}
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄袱浣�
+ string BillNoType1 = BillNo_PGD.Substring(0, Math.Min(2, BillNo_PGD.Length));
//鎴彇鏉＄爜绫诲瀷 鍓嶄笁浣�
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 (BillNoType1)
+ {
+ case "20"://娴佽浆鍗�
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ break;
+ }
+
switch (BillNoType2)
{
case "GXLZ"://宸ュ簭娴佽浆娲惧伐
@@ -210,12 +226,34 @@
}
}
break;
+ case "P202"://娴佽浆鍗�
+ case "P203"://娴佽浆鍗�
+ case "P204"://娴佽浆鍗�
+ case "P205"://娴佽浆鍗�
+ case "P201"://娴佽浆鍗�
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ break;
}
switch (BillNoType)
//寰楀埌淇℃伅
{
case "HCX"://鐢熶骇璧勬簮鐮�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 鏉＄爜缂栧彿 = '" + BillNo + "'", "h_v_Gy_SourceList");
+ case "htt"://鐢熶骇璧勬簮鐮�
+
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+ ds = oCN.RunProcReturn(@"select s.HItemID,s.HName 鐢熶骇璧勬簮鍚嶇О,s.HNumber from Gy_EquipFileBillMain a
+ left join Gy_Source s on a.HSourceID = s.HItemID
+ where HBarCode = '" + BillNo_PGD + "'", "Gy_EquipFileBillMain");
+ }
+ else {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 鏉＄爜缂栧彿 = '" + BillNo + "'", "h_v_Gy_SourceList");
+ }
+ }
+
break;
case "SBM"://璁惧鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_EquipMentList where HItemID = '" + BillNo + "'", "h_v_Gy_EquipMentList");
@@ -303,6 +341,127 @@
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 宸ュ簭鍑虹珯姹囨姤鍗昉DA鎵搷浣滃憳
+ [Route("Cj_StationBill/txtHBarCode_KeyDown_Operator")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown_Operator(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;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New where 鑱屽憳浠ｇ爜 = '" + HBarCode + "'", "h_v_Gy_EmployeeList_New");
+
+ //鍐欏叆淇℃伅
+ 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;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭杩涚珯鎵厤浠剁爜
+ [Route("Cj_StationBill/txtHBarCode_Mater_KeyDown")]
+ [HttpGet]
+ public object txtHBarCode_Mater_KeyDown(string HBarCode, string HInterID)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇鏉″舰鐮佹槸鍚﹀湪鏉＄爜妗ｆ涓紝鍒ゆ柇鏉″舰鐮佹槸鍚﹀悎鐞�
+ //鍏堝垽鏂� 涓存椂琛ㄤ腑鏄惁鏈夋暟鎹紝鏉″舰鐮佺殑鐗╂枡鏄惁鍦ㄦ竻鍗曚腑锛屽啓鍏� 鎵爜璁板綍琛�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBillSub_BindBarCode " + HInterID.ToString() + " ,'" + HBarCode + "'", "h_p_MES_StationInBillSub_BindBarCode");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ DataSet Dsplay = oCN.RunProcReturn("exec h_p_MES_StationInBillSub_BindDisplay " + HInterID.ToString() + " ", "h_p_MES_StationInBillSub_BindDisplay");
+
+ //鍐欏叆淇℃伅
+ if (Dsplay == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒锋柊澶辫触,鏃犳暟鎹樉绀猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (Dsplay.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 = "缁戝畾鎴愬姛锛�";
+ objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
@@ -1023,14 +1182,21 @@
}
ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
- if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ string sErr = "";
+ oSystemParameter.ShowBill(ref sErr);
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
{
- //涓嶆槸绠＄悊鍛�
- sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ }
+ else
+ {
+ if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ {
+ //涓嶆槸绠＄悊鍛�
+ sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ }
}
-
- string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+ string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere ;
ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
@@ -1111,8 +1277,10 @@
long HProcID = list[0].HProcID;//宸ュ簭ID
long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ long HQCSchemeID = list[0].HQCSchemeID;//妫�楠屾柟妗�
long HProcExchInterID = list[0].HProcExchInterID;//娴佽浆鍗D
long HProcExchEntryID = list[0].HProcExchEntryID;//娴佽浆鍗″瓙ID
+ string HBatchNo = list[0].HBatchNo;//娴佽浆鍗℃壒娆″彿
long HMainSourceInterID = list[0].HMainSourceInterID;//婧愬崟ID
long HMainSourceEntryID = list[0].HMainSourceEntryID;//婧愬崟瀛怚D
string HMainSourceBillNo = list[0].HMainSourceBillNo;//婧愬崟鍗曞彿
@@ -1158,7 +1326,14 @@
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);
+ oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
+
+ oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);//妫�楠岃褰�
+ oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+
+
BillNew.DetailColl.Add(oSub);
}
@@ -1202,26 +1377,44 @@
oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
+ ",HPRDORGID,HLastResult,HProcID,HQCSchemeID,HBatchNo," +
+ "HProcExchInterID,HProcExchEntryID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
+ "," + HPRDORGID + ",'" + HLastResult + "','" + HProcID + "','" + HQCSchemeID + "','" + HBatchNo + "'," +
+ "" + HProcExchInterID + "," + HProcExchEntryID + "," + HMainSourceInterID + "," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in BillNew.DetailColl)
{
+ string sql = "Insert into QC_FirstPieceCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID" +
+ ",HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckItemID,HQCStd,HResult" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
+ ") values("
+ + HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
+ "," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + 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 + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
+ ")";
+
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" +
+ ",HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult," +
+ "HQCNote,HMax,HMin,HAvg" +
") values("
+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + 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 + "'" +
+ ",'" + oSub.HStatus + "'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
+ ",'" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
") ");
}
}
@@ -2532,6 +2725,6 @@
}
}
#endregion
- //
+ //
}
}
\ No newline at end of file
--
Gitblit v1.9.1