From a13f5ebdf7883ca79dd5d91234ff451ff551c6df Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 06 八月 2021 13:46:46 +0800
Subject: [PATCH] 修改了模具生产领料单 模具生产退库单扫码 提交方法
---
WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs | 187 +++++++++++++++++++++++++++++++++++-----------
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 10 +-
WebAPI/WebServer.cs | 24 +++--
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/Sc_MouldController.cs | 10 +-
5 files changed, 165 insertions(+), 66 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 妯℃不鍏蜂繚鍏昏褰曟彁浜�
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 81af6ee..2bc9e08 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -190,10 +190,10 @@
//msg2 = "[" + msg2.ToString() + "]";
msg1 = "[" + msg1.ToString() + "]";
DAL.ClsSc_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
- List<Model.ClsSc_MouldProdOutBillMain> mainList = Newtonsoft
+ List<Model.ClsSc_MouldStockBillMain> mainList = Newtonsoft
.Json
.JsonConvert
- .DeserializeObject<List<Model.ClsSc_MouldProdOutBillMain>>(msg1);
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(msg1);
List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
.Json
.JsonConvert
@@ -213,6 +213,7 @@
}
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HInterID = mainList[0].HInterID;
BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
BillNew.omodel.HMaker = mainList[0].HMaker;
BillNew.omodel.HDate = HDate;
@@ -229,7 +230,8 @@
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
-
+
+ oSub.HInterID = mainList[0].HInterID;
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
@@ -287,7 +289,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HInterID.ToString()+"鍗曟嵁涓籌D:"+ mainList[0].HInterID;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 3cd1aa7..534a941 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index cc6bb90..a858cf7 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -21,7 +21,7 @@
<publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/02/2021 10:33:56</publishTime>
+ <publishTime>08/02/2021 13:31:49</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
@@ -162,10 +162,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/28/2021 19:12:01</publishTime>
+ <publishTime>08/06/2021 10:14:10</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/28/2021 19:12:01</publishTime>
+ <publishTime>08/06/2021 10:14:10</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -189,7 +189,7 @@
<publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/02/2021 10:33:56</publishTime>
+ <publishTime>08/02/2021 13:31:49</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>05/10/2021 09:27:02</publishTime>
@@ -336,7 +336,7 @@
<publishTime>07/14/2021 15:45:15</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/28/2021 19:12:05</publishTime>
+ <publishTime>08/06/2021 10:14:23</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 4285e6e..abac15c 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -4839,17 +4839,19 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveProductInBill_New(oMain, sHSourceType, ref sErrMsg))
{
- //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
- if (set_UpdateHStatus(oMain.HInterID,oMain.HExplanation.ToString()))
- {
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- return true;
- }
- else
- {
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
- return true;
- }
+ ////鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ //if (set_UpdateHStatus(oMain.HInterID,oMain.HExplanation.ToString()))
+ //{
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ // return true;
+ //}
+ //else
+ //{
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ // return true;
+ //}
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
}
else
{
--
Gitblit v1.9.1