From 53dcf90a8fd45c769e419f82ea561aaeb8d1bbef Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 31 五月 2024 13:13:13 +0800
Subject: [PATCH] 工序:新增/编辑 时,选着检验方案后,保存失败; 检验方案:回显分析方法、缺陷等级 、破坏性检验、重点检查; 工序检验单:选择抽样方案后关闭弹框; 产品器具清单:增加工序字段; 维修记录单维护:初始化日期; 维修验收单维护:列表 显示 验收项目 显示不对,编辑 时,子表 验收项目 回显 数据不对
---
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index c5a0407..f1797c9 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -157,6 +157,16 @@
string HOWNERTYPEINID = mainList[0].HOWNERTYPEINID;
string HBUSINESSTYPE = mainList[0].HBUSINESSTYPE;
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
ds = oCn.RunProcReturn("select * from h_v_IF_MoveStockRequestBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_MoveStockRequestBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
@@ -364,6 +374,17 @@
{
try
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ 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("Delete From Kf_MoveStockRequestBillMain where HInterID = " + HInterID);
oCn.RunProc("Delete From Kf_MoveStockRequestBillSub where HInterID = " + HInterID);
@@ -417,7 +438,18 @@
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;
+ }
+
ClsPub.CurUserName = user;
BillOld.MvarItemKey = "Kf_MoveStockRequestBillMain";
oCn.BeginTran();//寮�濮嬩簨鍔�
--
Gitblit v1.9.1