From c48c7746efa89e3cbf38e089d20cd9029c2ce1c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 07 六月 2024 09:52:37 +0800
Subject: [PATCH] 模具点检单PDA 扫条码没有返回数据，核对匹配字段
---
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 149 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 136 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 5b453d2..d312330 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1244,6 +1244,8 @@
}
//==================================================================================
+ //鏇存柊鍙婃椂搴撳瓨琛� 鍑忓皯璋冨叆搴撳瓨,澧炲姞璋冨嚭搴撳瓨
+ ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move '"+ oBill.omodel.HInterID + "','"+ oBill.omodel.HBillType+ "','1'", "h_KF_UPDateICinventory_Move");
//瀹℃牳鍗曟嵁
if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
@@ -1296,6 +1298,8 @@
}
//===========================================================
+ //鏇存柊鍙婃椂搴撳瓨琛� 澧炲姞璋冨叆搴撳瓨,鍑忓皯璋冨嚭搴撳瓨
+ ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','2'", "h_KF_UPDateICinventory_Move");
//鍙嶅鏍稿崟鎹�
if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
@@ -1856,7 +1860,7 @@
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
@@ -1865,7 +1869,7 @@
if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
{
objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
@@ -1890,11 +1894,11 @@
oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Delete " + HInterID);
- //oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
- //oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
- string sql = "exec h_p_WMS_ICStockBillAndWMS_Delete " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','1205'";
- oCn.RunProc(sql);
+ //string sql = "exec h_p_WMS_ICStockBillAndWMS_Delete " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','1205'";
+ //oCn.RunProc(sql);
//鍒犻櫎鍚庢帶鍒�==================================================================================
string sql2 = "exec h_p_Kf_SellOutBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
@@ -1903,7 +1907,7 @@
{
s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
objJsonResult.data = null;
oCN.RollBack();
@@ -1913,7 +1917,7 @@
{
s = ds.Tables[0].Rows[0]["HRemark"].ToString();
objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
objJsonResult.data = null;
oCN.RollBack();
@@ -3296,7 +3300,6 @@
}
//==================================================================================
-
//瀹℃牳鍗曟嵁
if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ICStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
@@ -3347,7 +3350,6 @@
return objJsonResult;
}
//===========================================================
-
//鍙嶅鏍稿崟鎹�
if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ICStockBill_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
@@ -4596,7 +4598,7 @@
{
//ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- ds = oCN.RunProcReturn("select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit", "h_v_Sc_MouldRepairCheckBillList_Edit");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit", "h_v_Sc_MouldRepairCheckBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4607,7 +4609,7 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = "select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
+ string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
@@ -5035,6 +5037,7 @@
DAL.ClsSc_MouldMaintainPlanBill oBill = new DAL.ClsSc_MouldMaintainPlanBill();
List<Model.ClsSc_MouldMaintainPlanBillMain> lsmain = new List<Model.ClsSc_MouldMaintainPlanBillMain>();
+
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_MouldMaintainPlanBillMain(msg2);
@@ -5044,6 +5047,8 @@
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3818";
oItem.HBillSubType = "3818";
+ oItem.HMainSourceInterID = oItem.HMouldMaintainRuleID;
+ oItem.HMainSourceBillNo = oItem.HMouldMaintainRuleNo;
//oItem.HInterID =0;
//oItem.HBillNo = "";
@@ -6599,6 +6604,124 @@
}
#endregion
+ #region 鍣ㄥ叿鐐规璁″垝鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sc_MouldDotCheckPlanBill/CheckSc_MouldDotCheckPlanBill")]
+ [HttpGet]
+ public object CheckSc_MouldDotCheckPlanBill(string HInterID, int Type, string user)
+ {
+ DAL.ClsSc_MouldDotCheckPlanBill BillOld = new DAL.ClsSc_MouldDotCheckPlanBill();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_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;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑷姩鐢熸垚鐐规璁″垝鍗�
+ oCN.RunProc("exec h_p_Sc_MouldDotCheckPlan_Auto " + HInterID);
+ }
+ else
+ {
+ if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ }
+ else
+ {
+ 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[鍣ㄥ叿鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁--淇濆吇璁″垝]
+ [Route("Sc_MouldDotCheckPlanBill/GetPlanList")]
+ [HttpGet]
+ public object GetPlanList_Check(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanList", "h_v_Sc_MouldDotCheckPlanList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldDotCheckPlanList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckPlanList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁″垝锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
#endregion
@@ -6618,7 +6741,7 @@
return objJsonResult;
}
//寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from Gy_MouldFileMain where HNumber= '" + HBarCode + "'", "Gy_MouldFileMain");
+ ds = oCN.RunProcReturn("select top 1 * from Gy_MouldFileMain where HBarCode= '" + HBarCode + "'", "Gy_MouldFileMain");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1