From 077dd1267cbe547ca584cb7befc99c238c68b08f Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期三, 06 十月 2021 09:20:22 +0800
Subject: [PATCH] 控制不良品入库单
---
WebAPI/Service/YqnQbService.cs | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 79b7383..24ed380 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -19,9 +19,9 @@
/// </summary>
/// <returns></returns>
public static ApiResult<DocumentsView> GetInterBillNo(string billType)
- {
- var hInterId= DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo);
- var hBillNo= DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ {
+ var hInterId = DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo);
+ var hBillNo = DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true);
if (hInterId == 0 || string.IsNullOrEmpty(hBillNo))
return new ApiResult<DocumentsView> { code = -1, msg = "鑾峰彇澶辫触" };
DocumentsView documentsView = new DocumentsView()
@@ -42,14 +42,14 @@
var dataSet = GetBarCodeDb(sBillBarCode);
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ祦杞崱鍙�" };
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛",data=dataSet };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
/// <summary>
/// 娴佽浆鍗″洖杞︽柟娉�
/// </summary>
public static ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo)
{
- if (string.IsNullOrEmpty(sBillNo)||string.IsNullOrEmpty(sProcNo))
+ if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo))
return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜鍜屾祦杞崱涓嶈兘涓虹┖" };
var dataSet = GetProcDb(sBillNo, sProcNo);
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
@@ -96,12 +96,12 @@
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
try
{
- if (oMain.HProcID == 0 || oMain.HQty == 0 ||string.IsNullOrEmpty(oMain.HProcExchBillNo)||oMain.HQty==0||string.IsNullOrEmpty(oMain.HBillNo))
+ if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
- var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
+ var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
if (stationInList.Count > 0)
{
- var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
+ var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//鑾峰彇杩涚珯鍗曟渶鏂拌繘绔欏伐搴�
if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
@@ -126,7 +126,7 @@
}
catch (Exception ex)
{
- return new ApiResult { code = -1, msg = "璇锋眰閿欒"+ex.ToString() };
+ return new ApiResult { code = -1, msg = "璇锋眰閿欒" + ex.ToString() };
}
finally
{
@@ -190,10 +190,10 @@
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
try
{
- var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HICMOBillNo);
+ var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HProcExchBillNo);
if (stationInBillModel == null)
return new ApiResult { code = -1, msg = "璇ュ伐搴忚繘绔欏崟涓嶅瓨鍦�" };
- var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HICMOBillNo);
+ var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HProcExchBillNo);
if (stationOutBillModel != null)
return new ApiResult { code = -1, msg = "璇ュ伐搴忓凡瀛樺湪鍑虹珯鍗�" };
omodel.HYear = DateTime.Now.Year;
@@ -209,6 +209,48 @@
dicLock.TryRemove(omodel.HICMOBillNo + "cz", out string key);
}
+ }
+ /// <summary>
+ /// 鑾峰彇宸ュ簭璇︽儏
+ /// </summary>
+ /// <param name="hItemId"></param>
+ /// <returns></returns>
+ public static ApiResult<Models.M_Process> GetProcessDetail(int hItemId)
+ {
+ var processModel = ProcessDal.GetProcessDetail(hItemId);
+ if (processModel == null)
+ return new ApiResult<M_Process> { code = -1, msg = "鏌ヨ涓虹┖" };
+ processModel.DepartmentModel = ProcessDal.GetDepartmentModel(processModel.HDeptID);
+ processModel.ProcMulModel = ProcessDal.GetProcMulModel(processModel.HProcMulID);
+ return new ApiResult<M_Process> { code = 1, msg = "鏌ヨ鎴愬姛", data = processModel };
+ }
+ /// <summary>
+ /// 鑾峰彇宸ュ簭鍒楄〃
+ /// </summary>
+ /// <param name="hName"></param>
+ /// <param name="hLevel"></param>
+ /// <param name="hNumber"></param>
+ /// <param name="hBillSubType"></param>
+ /// <returns></returns>
+ public static ApiResult<List<Models.M_Process>> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit)
+ {
+ int pageCount = 0;
+ var list = ProcessDal.GetProcessList(hName, hLevel, hNumber, hBillSubType, page, limit, ref pageCount);
+ if (list?.Count == 0)
+ return new ApiResult<List<M_Process>> { code = -1, msg = "鏌ヨ涓虹┖" };
+ return new ApiResult<List<M_Process>> { code = 0, msg = "鏌ヨ鎴愬姛", data = list, count = pageCount };
+ }
+ /// <summary>
+ /// 鍒犻櫎涓�鏉″伐搴�
+ /// </summary>
+ /// <param name="hItemID"></param>
+ /// <returns></returns>
+ public static ApiResult DeleteProcess(int hItemID)
+ {
+ var result = ProcessDal.DeleteProcess(hItemID);
+ if (result > 0)
+ return new ApiResult { code = 1, msg = "鍒犻櫎鎴愬姛" };
+ return new ApiResult { code = -1, msg = "鍒犻櫎鏁版嵁涓嶅瓨鍦�" };
}
#region sql璇彞
public static DataSet GetStationOutBill(string strWhere)
@@ -282,7 +324,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
- //oCN.BeginTran();
+ oCN.BeginTran();
var sql = "Insert Into Sc_StationOutBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
@@ -296,7 +338,7 @@
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
- "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +"," + omodel.HProcNo + ") ";
+ "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HProcNo + ") ";
//var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql);
oCN.RunProc(sql);
oCN.Commit();
@@ -304,7 +346,7 @@
}
catch (Exception ex)
{
- return new ApiResult { code = -1, msg = "淇濆瓨閿欒/"+ex.ToString() };
+ return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + ex.ToString() };
}
}
public static ApiResult SetInBill(ClsSc_StationInBillMain omodel)
--
Gitblit v1.9.1