合并分支

chenhaozhe

2025-06-13 9b54060aab13ef42f1d251dad16bef4d0c9264d9

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_ErrWorkTimesRequestBillController.cs

@@ -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 +   //判断是否是导入
                        "')";

                    //主表