From be84cd7103a846ad4b7b1601cb5ec9f1447e482d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 11 一月 2024 09:52:25 +0800
Subject: [PATCH] 工序流转卡派工单保存方法，增加 调用 保存前控制 h_p_Sc_ProcExchSendWorkBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_ProcExchSendWorkBill_AfterSaveCtrl的 存储过程。 工序委外派工单保存方法，增加 调用 保存前控制 h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl 和保存后控制 h_p_WW_EntrustWorkOrderBill_AfterSaveCtrl的 存储过程。 工序进站接收单保存方法，增加 调用 保存前控制 h_p_Sc_StationInBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_StationInBill_AfterSaveCtrl的 存储过程。 工序出站汇报单保存方法，增加 调用 保存前控制 h_p_Sc_StationOutBill_BeforeSaveCtrl 和保存后控制 h_p_Sc_StationOutBill_AfterSaveCtrl的 存储过程。
---
WebAPI/Controllers/ProductInController.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 4a98976..d134bff 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -358,8 +358,9 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
string sExpressNumber = "";
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
bool flag = WebSoBar == null;
object result;
if (flag)
@@ -1238,8 +1239,8 @@
List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
ListModels listModels = new ListModels();
list = listModels.getProductInBillMainByJson(jsonString);
- list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
- list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
+ //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string hbillType = list[0].HBillType;
WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
clsKf_ProductInBillMain.HInterID = list[0].HInterID;
@@ -1248,18 +1249,37 @@
clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
+ clsKf_ProductInBillMain.HSecManagerID = list[0].HSecManagerID;
clsKf_ProductInBillMain.HRemark = list[0].HRemark;
clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+ clsKf_ProductInBillMain.HBillerID = list[0].HBillerID;
clsKf_ProductInBillMain.HWHID = list[0].HWHID;
clsKf_ProductInBillMain.HSupID = list[0].HSupID;
clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
clsKf_ProductInBillMain.HBillType = "1202";
+ if (list[0].HBillType == "3714")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "宸ュ簭姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3711")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3710")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇璁㈠崟";
+ }
+ else
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+ }
bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
if (flag)
{
this.objJsonResult.code = "0";
this.objJsonResult.count = 1;
- this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
this.objJsonResult.data = null;
result = this.objJsonResult;
}
@@ -1267,7 +1287,8 @@
{
this.objJsonResult.code = "0";
this.objJsonResult.count = 0;
- this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
this.objJsonResult.data = null;
result = this.objJsonResult;
}
--
Gitblit v1.9.1