From 7bf3d3a373b61def534d6110d393c1b9db3422d6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 21 五月 2024 16:28:24 +0800
Subject: [PATCH] 销售订单关闭和行关闭 增加 关闭后控制的 存储过程 ：h_p_Xs_SeOrderBill_AfterCloseCtrl 增加 行关闭后控制的 存储过程：h_p_Xs_SeOrderBill_AfterEntryCloseCtrl 参数 @HInterID int, --单据ID @HBillNo varchar(50), --单据号 @HUser varchar(100) --用户 存储过程里 增加 控制， 当 这个销售订单 出库数量为0， 但是 下推的 工序流转卡 已经 染厂（工序可以写死）进站或出站记录后。 进行报错，不允许关闭；（行关闭，只考虑本行； 整单关闭则 需要 全部行都考虑）
---
WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs b/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
index 8372717..00449af 100644
--- a/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using System.Windows.Forms;
namespace WebAPI.Controllers
{
@@ -513,28 +514,65 @@
}
//==================================================================================
+ //瀹℃牳鎻愪氦
oCN.BeginTran();
//澧炲姞鍏宠仈
- oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Check " + HInterID + ",'" + CurUserName + "'");
- //瀹℃牳鎻愪氦
- if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
+ oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Check " + oBill.omodel.HInterID + ",'" + CurUserName + "'");
+ //鍐欏叆鏃ュ織
+ string WorkList = "瀹℃牳鍗曟嵁锛屽崟鎹彿锛�" + oBill.omodel.HBillNo;
+ string SystemName = "LMES-閿�鍞��璐у崟妯″潡";
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + CurUserName + "','" + SystemInformation.ComputerName + "','" + WorkList + "','" + SystemName + "','','瀹℃牳')"
+ );
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql = "exec h_p_Kf_SellOutBackBill_AfterCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutBackBill_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳杩囩▼涓嚭閿欙紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
}
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+
+ //if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ //{
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "瀹℃牳鎴愬姛";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
--
Gitblit v1.9.1