From 42c5ed8edc862ebc80c117ed9a26e00f6f3e844d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 17 十二月 2024 08:24:11 +0800
Subject: [PATCH] 基础资料单据（产品工艺参数、设备启动点检清单、产品防错验证清单）增加 导入按钮
---
WebAPI/Controllers/工资管理/Pay_ErrWorkTimesRequestBillController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
index 4a3c131..a219136 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_ErrWorkTimesRequestBillController.cs"
@@ -131,7 +131,7 @@
res.count = CountConstant.FAIL;
res.Message = "Exception锛�" + e.ToString();
res.data = null;
- return objJsonResult;
+ return res;
}
}
#endregion
@@ -856,7 +856,7 @@
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
- "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate) " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark, HMaker,HMakeDate,HIsImport) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -881,6 +881,7 @@
"','" + HRemark +
"','" + HMaker +
"','" + HMakerDate +
+ "','" + 0 + //鍒ゆ柇鏄惁鏄鍏�
"')";
//涓昏〃
--
Gitblit v1.9.1