From d36ee02a8062d81006324ac3f2170cb1c45e3359 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期四, 25 四月 2024 17:12:50 +0800 Subject: [PATCH] 1.以下基础资料 测试并完善功能; 供应商,职员,物料,客户,班组 (测试必录项目,新增,修改,删除,审核,反审核 等功能,有图片预览的 完善图片预览以及上传功能) 2.客户 增加字段 领用人 HMateOutEmp varchar(100) 生产班组 增加 字段 劳务单位 HCompName varchar(200) --- WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs index 18ab08f..55daeae 100644 --- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs +++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs @@ -1762,8 +1762,24 @@ if (IsAudit == 1) //鍙嶅叧闂彁浜� { //鍙嶅叧闂彁浜� + oBill.oCn.BeginTran(); if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) { + + //鎺у埗鍏宠仈鏁伴噺,鍒ゆ柇鍙嶅叧闂悗锛岀敓浜ц鍗曚笅鎺ㄦ祦杞崱鎬绘暟鏄惁瓒呰繃璁″垝鏁伴噺 + ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + lngBillKey, "h_p_Sc_ProcessExchangeBill_Checkqty"); + if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString(); + objJsonResult.data = null; + + oBill.oCn.RollBack(); + return objJsonResult; + } + + oBill.oCn.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鍙嶄綔搴熸垚鍔�"; -- Gitblit v1.9.1