From 10c62342fe2fb3356004c427a2f10655c14668e4 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期六, 07 八月 2021 16:56:44 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs | 187 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 141 insertions(+), 46 deletions(-)
diff --git a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
index b8e2758..dc72dd6 100644
--- a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
+++ b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
@@ -17,20 +17,23 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
+ public WebS.WebService1 oWebs = new WebS.WebService1();
+ //public WebS.ClsGy_BarCodeBill_WMS_Model_View ds = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
+ public Model.ClsKF_PonderationBillMain_Temp omodel = new Model.ClsKF_PonderationBillMain_Temp();
public DAL.ClsSc_MouldDotCheckBill BillNew = new DAL.ClsSc_MouldDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldDotCheckBill BillOld = new DAL.ClsSc_MouldDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldMaintainBill BillNew1 = new DAL.ClsSc_MouldMaintainBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldMaintainBill BillOld1 = new DAL.ClsSc_MouldMaintainBill(); //瀵瑰簲鍗曟嵁绫�
+ DataSet ds;
#region 妯℃不鍏风偣妫�璁板綍鍗�
#region 鏍规嵁妯℃不鍏锋潯鐮佹煡鎵炬ā鍏锋。妗堜俊鎭�
[Route("Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown")]
[HttpGet]
- public object txtHBarCode_KeyDown(string HBarCode)
+ public object txtHBarCode_KeyDown(string HBarCode,long HInterID,long HWHID,long HSPID)
{
try
{
@@ -44,8 +47,9 @@
}
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
+ //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
//鍐欏叆淇℃伅
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ if (ds == null )
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -53,11 +57,37 @@
objJsonResult.data = null;
return objJsonResult;
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ else
+ {
+ omodel.HInterID = HInterID;
+ omodel.HBillType = "3796";
+ omodel.HMaker = DBUtility.ClsPub.CurUserName;
+ omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HQty = 0;
+ omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
+ omodel.HWhID = HWHID;
+ omodel.HStockPlaceID = HSPID;
+ omodel.HSourceBillNo = "1";
+ omodel.HSourceBillType = "1";
+ omodel.HSourceEntryID = 0;
+ omodel.HSourceInterID = 0;
+ if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛樺叆缂撳瓨琛ㄥけ璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
catch (Exception e)
{
@@ -68,7 +98,72 @@
return objJsonResult;
}
}
+
+ public bool set_SavePonderationBillMain_Temp(Model.ClsKF_PonderationBillMain_Temp oMain, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ DAL.ClsGy_BarCodeBill_View oBar = new DAL.ClsGy_BarCodeBill_View();
+ dal.oModel = oMain;
+ if (!oBar.GetInfoByNumber_View(oMain.HBarCode))
+ {
+ sErrMsg = "鏃犳晥鏉＄爜";
+ return false;
+ }
+ else
+ {
+ if (oBar.omodel_View.HBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ if (!dal.IsBarCode_Pack(oMain.HBarCode, oMain.HInterID, oMain.HBillType))
+ {
+ sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ return false;
+ }
+ if (dal.AddNew_More(ref sErrMsg))
+ {
+ //sErrMsg = "淇濆瓨鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ //sErrMsg = "淇濆瓨澶辫触锛�";
+ return false;
+ }
+ }
+ else
+ {
+ if (oBar.omodel_View.HBarCodeType == "鍞竴鏉＄爜")
+ {
+ if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType))
+ {
+ sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ return false;
+ }
+ //鍒ゆ柇鏉＄爜涓存椂琛ㄤ腑鏄惁瀛樺湪(璋冩嫧鍗曞悓涓�鏉＄爜鐩稿悓璋冨叆璋冨嚭浠撳簱浠撲綅鍙厑璁告壂鎻忎竴娆★紝閿�鍞嚭搴撳悓涓�鏉＄爜鍚屼竴浠撳簱浠撲綅鍙厑璁告壂鎻忎竴娆�) 涓镐簳
+ //if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType,oMain.HWhID,oMain.HStockPlaceID,oMain.HSCWHID,oMain.HOutStockPlaceID,oMain.))
+ //{
+ // sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ // return false;
+ //}
+ }
+ if (dal.AddNew(ref sErrMsg))
+ {
+ //sErrMsg = "淇濆瓨鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ //sErrMsg = "淇濆瓨澶辫触锛�";
+ return false;
+ }
+ }
+ }
+ //dal.oCn.CnClose();
+ //dal.oCn.CnDispose();
+ //oBar.
+ }
#endregion
+
+
#region 妯℃不鍏风偣妫�璁板綍鎻愪氦
@@ -214,44 +309,44 @@
#region 鏍规嵁妯℃不鍏锋潯鐮佹煡鎵炬ā鍏锋。妗堜俊鎭�
[Route("Mj_PDA_MouldMaintainBill/txtHBarCodeMaintain_KeyDown")]
[HttpGet]
- public object txtHBarCodeMaintain_KeyDown(string HBarCode)
- {
- try
- {
- if (HBarCode == null || HBarCode.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
- //鍐欏叆淇℃伅
- 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;
- }
- }
+ //public object txtHBarCodeMaintain_KeyDown(string HBarCode)
+ //{
+ // try
+ // {
+ // if (HBarCode == null || HBarCode.Equals(""))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //寰楀埌淇℃伅
+ // ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
+ // //鍐欏叆淇℃伅
+ // 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 妯℃不鍏蜂繚鍏昏褰曟彁浜�
--
Gitblit v1.9.1