From 702aba29448a0f5729f31df6f511873b8d42cef2 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 22 十一月 2021 14:24:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/Kf_MateOutBillController.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs"
index 851281a..097ea57 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/Kf_MateOutBillController.cs"
@@ -52,12 +52,12 @@
/// 鐢熶骇棰嗘枡鍗曞垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
- [Route("Sc_MouldProdInBill/set_DeleteBill")]
+ [Route("Kf_MateOutBill/set_DeleteBill")]
[HttpGet]
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -77,7 +77,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- DLL.ClsSc_MouldProdInBill oBill = new DLL.ClsSc_MouldProdInBill();
+ DLL.ClsKf_MateOutBill oBill = new DLL.ClsKf_MateOutBill();
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HBillStatus > 1)
@@ -141,13 +141,13 @@
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
/// <returns></returns>
- [Route("Sc_MouldProdInBill/set_CheckBill")]
+ [Route("Kf_MateOutBill/set_CheckBill")]
[HttpGet]
public object set_CheckBill(int HInterID, string CurUserName)
{
- string ModRightNameCheck = "Sc_MouldProdInBill_Check";
+ string ModRightNameCheck = "Kf_MateOutBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
- DLL.ClsSc_MouldProdInBill oBill = new DLL.ClsSc_MouldProdInBill();
+ DLL.ClsKf_MateOutBill oBill = new DLL.ClsKf_MateOutBill();
try
{
//瀹℃牳鏉冮檺
@@ -248,13 +248,13 @@
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
/// <returns></returns>
- [Route("Sc_MouldProdInBill/set_AbandonCheck")]
+ [Route("Kf_MateOutBill/set_AbandonCheck")]
[HttpGet]
public object set_AbandonCheck(int HInterID, string CurUserName)
{
- string ModRightNameCheck = "Sc_MouldProdInBill_Check";
+ string ModRightNameCheck = "Kf_MateOutBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
- DLL.ClsSc_MouldProdInBill oBill = new DLL.ClsSc_MouldProdInBill();
+ DLL.ClsKf_MateOutBill oBill = new DLL.ClsKf_MateOutBill();
try
{
//瀹℃牳鏉冮檺
@@ -442,7 +442,7 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Edit", 1, true, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -455,7 +455,7 @@
List<Models.ClsKf_MateOutBillMain> lsmain = new List<Models.ClsKf_MateOutBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Kf_ICStockBillMain(msg2);
+ lsmain = oListModels.getObjectByJson_Kf_MateOutBillMain(msg2);
foreach (Models.ClsKf_MateOutBillMain oItem in lsmain)
{
if (refSav == "Add")
@@ -508,8 +508,8 @@
}
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3801";
- oItem.HBillSubType = "3801";
+ oItem.HBillType = "1204";
+ oItem.HBillSubType = "1204";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
@@ -621,7 +621,7 @@
{
//flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Check", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1