From 32a10c272b7cd543a7172a6ebc222e6f8c8b0334 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:23 +0800
Subject: [PATCH] 森楷自动包装线同步金蝶入库申请单，如果没有审核，则在扫物料条码时自动审核；排产匹配产品器具清单，产线器具清单，器具占用时间存入数据库
---
WebAPI/Controllers/条码管理/MouldController.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index 9c86a81..366aa5c 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -26,6 +26,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string ComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
#region 鍣ㄥ叿鎵爜妯″潡璋冪敤鏂规硶
@@ -225,7 +226,7 @@
/// <returns></returns>
[Route("MouldController/set_DelMouldStockBillMain_Temp_Json")]
[HttpGet]
- public object set_DelPonderationBillMain_Temp_BarCode_Json(Int64 HInterID, string HBillType, string HBarCode)
+ public object set_DelMouldStockBillMain_Temp_Json(Int64 HInterID, string HBillType, string HBarCode)
{
try
{
@@ -258,9 +259,9 @@
/// 鍣ㄥ叿缂撳瓨鍒楄〃鐣岄潰锛岃繑鍥炵紦瀛樺垪琛ㄤ俊鎭�
/// </summary>
/// <returns></returns>
- [Route("MouldController/GetKf_PonderationBillMain_TempList_New_Json")]
+ [Route("MouldController/GetSc_MouldStockBillMain_TempList_Json")]
[HttpGet]
- public object GetKf_PonderationBillMain_TempList_New_Json(string HBillType, string HMaker, Int64 HStockOrgID)
+ public object GetSc_MouldStockBillMain_TempList_Json(string HBillType, string HMaker, Int64 HStockOrgID)
{
try
{
@@ -358,19 +359,28 @@
/// <returns></returns>
[Route("MouldController/set_DeleteMouldBillList_Json")]
[HttpGet]
- public object set_DeleteMouldBillList_Json(long HInterID, string HBillType)
+ public object set_DeleteMouldBillList_Json(long HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
{
try
{
+ string WorkList = "鍒犻櫎缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
+ oCn.BeginTran();
oCn.RunProc("Delete from Sc_MouldStockBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')"
+ );
+ oCn.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
{
+ oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎鍣ㄥ叿缂撳瓨鍒楄〃鍗曟嵁澶辫触锛�" + e.ToString();
--
Gitblit v1.9.1