From 102e51778ca6e3b4abe0e0099e39eced9993a5c0 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期一, 10 一月 2022 05:55:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/ProductInController.cs | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 44f87b5..48559e9 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -284,6 +284,84 @@
/// <summary>
+ /// 缂栬緫椤甸潰杩斿洖浜у搧鍏ュ簱鏉＄爜涓存椂琛ㄤ俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetHBarCodeShowBillSub")]
+ [HttpGet]
+ public object GetHBarCodeShowBillSub(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere)
+ {
+ try
+ {
+ ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鐐瑰嚮缂栬緫 鍏敤绐椾綋鍒犻櫎鏂规硶
+ [Route("Kf_BarCodeEditDlg/DeltetBill")]
+ [HttpGet]
+ public object DeltetBill(long HInterID,string HBarCode,string HBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.set_DelPonderationBillMain_Temp_BarCode(HInterID,HBarCode, HBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+ /// <summary>
/// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏
/// </summary>
/// <returns></returns>
@@ -309,7 +387,7 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[3];
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
}
@@ -684,12 +762,12 @@
[Route("ProductIn/Delete_Json")]
[HttpGet]
- public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
+ public object Delete_Json(long HInterID,string HBillNo,string HBillType,string HBarCode)
{
string sErrMsg = string.Empty;
try
{
- if (webserver.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
+ if (webserver.DeleteBill(HInterID, HBillNo, HBillType, HBarCode, ref sErrMsg))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -701,17 +779,17 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" ;
objJsonResult.data = null;
return objJsonResult;
}
}
- catch (Exception)
+ catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1