From 1eeca243478b0aca67f9e213b54398a80aa4bccf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 二月 2024 17:32:38 +0800
Subject: [PATCH] PDA(首件/工序 检验单)；动态获取单据模块名称
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 131 ++++++++++++++++++++++++++++++++++++++-----
WebAPI/Controllers/WebAPIController.cs | 41 +++++++++++++
WebAPI/Controllers/品质管理/工序检验单/MES_ProcessCheckBill_PDAController.cs | 6 +
3 files changed, 160 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 8085b07..180eb6c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -349,14 +349,20 @@
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));
+
+ string sErr = "";
+
switch (BillNoType2)
{
case "GXLX"://娴佽浆鍗�
- string sErr = "";
+
+ string sql = "";
if (oSystemParameter.ShowBill(ref sErr))
{
if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
@@ -365,24 +371,117 @@
}
else
{
- ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'宸ュ簭','" + BillNo_PGD + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'鐗╂枡','" + BillNo_PGD + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetProcessExchangeBillList " + "'宸ヨ壓璺嚎','" + BillNo_PGD + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetProcessExchangeBillList");
+ break;
+ }
+
+ }
}
}
break;
+ case "GXCZ":
+ ds = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo = '" + HBarCode + "'", "Sc_StationOutBillMain");
+ Int64 HStationOutInterID = 0;
+
+ if (ds != null || ds.Tables[0].Rows.Count != 0)
+ {
+ HStationOutInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+ }
+
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'宸ュ簭','" + HStationOutInterID + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'鐗╂枡','" + HStationOutInterID + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'宸ヨ壓璺嚎','" + HStationOutInterID + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
+ break;
+ }
+
+ }
+ break;
+ case "MO00":
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'宸ュ簭','" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'鐗╂枡','" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOList " + "'宸ヨ壓璺嚎','" + HBarCode + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOList");
+ break;
+ }
+
+ }
+ break;
default:
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏉＄爜閿欒!";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ { //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜閿欒!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ break;
+ }
}
-
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+
+ switch (BillNoType)
+ //寰楀埌淇℃伅
+ {
+ case "HCX"://鐢熶骇璧勬簮鐮�
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 鏉＄爜缂栧彿 = '" + BillNo + "'", "h_v_Gy_SourceList");
+ break;
+ }
+
+ if (ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖鏁版嵁锛屾潯鐮佸墠缂�閿欒銆�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index f50621d..fd1ac4e 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -10950,6 +10950,47 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鍗曟嵁妯″潡鍚嶇О
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetModuleName")]
+ [HttpGet]
+ public object GetModuleName(string HModuleType)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("Select * from Xt_BillType where HNumber = '" + HModuleType + "'", "Xt_BillType");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
}
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
index feef7f9..75b3772 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDAController.cs"
@@ -66,6 +66,8 @@
long HProcID = list[0].HProcID;//宸ュ簭ID
long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+ Int64 HProcExchInterID = list[0].HProcExchInterID;//鎸囧紩鍗D
+ Int64 HProcExchEntryID = list[0].HProcExchEntryID;//鎸囧紩鍗″瓙ID
//琛ㄤ綋鏁版嵁
List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg_entry);
@@ -152,10 +154,10 @@
oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
- ",HPRDORGID,HLastResult)" +
+ ",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID)" +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
- "," + HPRDORGID + ",'" + HLastResult + "') ");
+ "," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HProcID + ") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_ProcessCheckBillSub oSub in BillNew.DetailColl)
--
Gitblit v1.9.1