From fc39fb3b951d6ac4e4e4de836091d671ec00c14d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 05 六月 2024 15:00:54 +0800
Subject: [PATCH] 1.更新菜单栏，报工台跳转过来时，根据物料+工序+生产资源带出对应清单信息 2.报工台跳转过来时，根据物料带出对应产品防错验证清单清单信息
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index e1d8567..9b417d9 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -541,7 +541,16 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
@@ -578,21 +587,12 @@
}
//==================================================================================
- //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
- string s = "";
- int sYear = 0;
- int sPeriod = 0;
- DateTime HDate = DateTime.Now;
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
- {
- objJsonResult.Message = s;
- return objJsonResult;
- }
-
//瀹℃牳鎻愪氦
oCN.BeginTran();
//澧炲姞鍏宠仈
oCN.RunProc("exec h_p_Kf_SellOutBill_Check " + HInterID + ",'" + oBill.BillType + "','" + CurUserName + "'");
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨
+ ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory '" + HInterID + "','" + oBill.BillType + "','1'", "h_KF_UPDateICinventory");
//鍐欏叆鏃ュ織
string WorkList = "瀹℃牳鍗曟嵁锛屽崟鎹彿锛�" + oBill.omodel.HBillNo;
string SystemName = "LMES-閿�鍞嚭搴撳崟妯″潡";
@@ -671,17 +671,6 @@
return objJsonResult;
}
//===========================================================
-
- //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
- string s = "";
- int sYear = 0;
- int sPeriod = 0;
- DateTime HDate = DateTime.Now;
- if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
- {
- objJsonResult.Message = s;
- return objJsonResult;
- }
//鍙嶅鏍告彁浜bandonCheck
//鍒犻櫎鍏宠仈
--
Gitblit v1.9.1