From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 16 五月 2023 11:11:15 +0800 Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段,放在接收数量后面,不允许编辑,每次扫进站单出站单的时候,自动把白坯发布的汇总数量显示。生产订单模块增加一个字段,是否取库存,底部备注,做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂(第一道和第二道)(把以前所有的流水号加20,在把白坯定型(10),和染厂(20)刷进去 --- WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs index f48232e..c4c808d 100644 --- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs +++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs @@ -18,6 +18,7 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); #region[鏂板鍗曟嵁-淇濆瓨鎸夐挳] /// <summary> @@ -816,7 +817,6 @@ return objJsonResult; } - Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) @@ -827,7 +827,6 @@ objJsonResult.data = null; return objJsonResult; } - //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲� SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); @@ -850,6 +849,23 @@ DBUtility.ClsPub.HOrgID = HPRDORGID; if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { + string sReturn = ""; + if (oSystemParameter.ShowBill(ref sReturn)) + { + if (oSystemParameter.omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame == "Y") + { + if (oBill.omodel.HMaker != user) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + + if (oBill.omodel.HBillStatus > 1) { objJsonResult.code = "0"; -- Gitblit v1.9.1