From ec622206f5adcbd7cb96f06d75ec03e6dc83a7fd Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 07 四月 2026 12:39:35 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/条码管理/MouldController.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index a85b288..bb34882 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -599,6 +599,7 @@
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillType = "3802";
+ BillNew.omodel.HBillSubType = "3802";
BillNew.omodel.HInterID = mainList[0].HInterID;
BillNew.omodel.HBillNo = mainList[0].HBillNo;
BillNew.omodel.HDate = mainList[0].HDate;
@@ -684,7 +685,8 @@
//淇濆瓨
bool bResult;
bResult = BillNew.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ oCn.RunProc("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 3802);
if (bResult)
{
objJsonResult.code = "0";
@@ -758,6 +760,7 @@
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillType = "3803";
+ BillNew.omodel.HBillSubType = "3803";
BillNew.omodel.HInterID = mainList[0].HInterID;
BillNew.omodel.HBillNo = mainList[0].HBillNo;
BillNew.omodel.HDate = mainList[0].HDate;
@@ -2049,6 +2052,61 @@
}
#endregion
+ #region 鍣ㄥ叿棰嗙敤鍗� 鎵弿婧愬崟鏉＄爜
+
+ /// <summary>
+ /// 鍣ㄥ叿棰嗙敤鍗� 鎵弿婧愬崟鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ [Route("MouldController/Get_SourceBarCode_ScrapRequest_Json")]
+ [HttpGet]
+ public object Get_SourceBarCode_ScrapRequest_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ //灏嗘簮鍗曚俊鎭瓨鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
+ DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddMouldBarCode_ScrapRequest " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + 0 + ",'" + HMaker + "'," + 0 + "," + HStockOrgID.ToString(), "h_p_WMS_AddMouldBarCode_ScrapRequest");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘皢婧愬崟淇℃伅瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds1.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
#endregion
--
Gitblit v1.9.1