From 2e90f42d7b81c38ecbd1770b2dfa4f275676301a Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 22 五月 2023 11:26:20 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs index 80f8aee..83b1ba4 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs @@ -124,6 +124,7 @@ long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID + double HmaterOutqty = list[0].HmaterOutqty;//鐧藉澂鍙戝竷 //鍗曟嵁瀹屾暣鎬у垽鏂� if (HMaterID <= 0) { @@ -191,6 +192,7 @@ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" + ",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" + + ",HmaterOutqty" + ") " + " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + "," + HYear + "," + HPeriod + ",'" + HRemark + "'" + @@ -199,7 +201,7 @@ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID + ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID + - ") "); + ","+ HmaterOutqty + ") "); } else if ("Modify".Equals(eventType)) { @@ -227,6 +229,7 @@ ",HProcExchBillNo='" + HProcExchBillNo + "'" + ",HMaterID=" + HMaterID + ",HProcID=" + HProcID + + ",HmaterOutqty=" + HmaterOutqty + ",HICMOQty=" + HICMOQty + ",HPlanQty=" + HPlanQty + ",HStationInTime=getdate()" + @@ -974,14 +977,22 @@ DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill(); if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo)) { - if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin")) + string sReturn = ""; + if (oSystemParameter.ShowBill(ref sReturn)) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒"; - objJsonResult.data = null; - return objJsonResult; + if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y") + { + if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒"; + objJsonResult.data = null; + return objJsonResult; + } + } } + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); DataSet ds; -- Gitblit v1.9.1