From 5049d1b4b5d74092f69aa3b3e4aa2fcfa8de808b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 四月 2024 17:17:05 +0800
Subject: [PATCH] 1.组织架构模块，增加 用户编码 字段； (非必录) 2.网页版：供应商 增加 字段 材料类别 下拉框（主材，辅材） HMaterClass varchar(20) 网页版： 付款单 表头 增加 字段 发票编号 ，大写金额 （大写金额 在输入 金额后 自动 带出，可以网上找下 小写金额 转 大写 的 代码 ），付款事由； 网页版： 直接调拨单 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料，表头 增加 字段 发票编号； 选择 表头 调入 调出 仓库后， 表体调入 调出 仓库为空的 也自动填充。
---
WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs | 90 +++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 56 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
index c2d9913..7e406a4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
@@ -27,73 +27,51 @@
/// <returns></returns>
[Route("Gy_BarCodeBillList/Sub_DeleteBill")]
[HttpGet]
- public object Sub_DeleteBill(long HInterID)
+ public object Sub_DeleteBill(long HInterID, string HBarCode)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
- Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- if (lngBillKey == 0)
+ DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
+ if (oBill.DeleteBill(HInterID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
- DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HBillStatus > 1)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HChecker != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
-
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
else
+ {
+ //鍒犻櫎鎴愬姛
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏉＄爜妗ｆ鍒楄〃鎵归噺鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_BarCodeBillList/Sub_MulDeleteBill")]
+ [HttpGet]
+ public object Sub_MulDeleteBill(string sInterID, string sBarCode)
+ {
+ DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
+ if (oBill.MulDeleteBill(sInterID, sBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //鍒犻櫎鎴愬姛
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1