设备/器具(保养规程，设备保养计划，设备保养记录单)表头增加“保养级别”字段

yusijie

2024-05-13 f82c03a6478eae9b515c37d6b4381c7e12197386

设备/器具(保养规程，设备保养计划，设备保养记录单)表头增加“保养级别”字段

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainBill.cs

@@ -57,7 +57,8 @@
                ",HEndDate='" + omodel.HEndDate + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HMouldMaintainRuleInterID="+omodel.HMouldMaintainRuleInterID.ToString()+
                ",HMouldMaintainRuleInterID=" + omodel.HMouldMaintainRuleInterID.ToString() +
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                //",HDeptID=" + omodel.HDeptID.ToString() +
                //",HDeptNumber='" + omodel.HDeptNumber +"'"+
                //",HEmpID=" + omodel.HEmpID.ToString() +
@@ -146,13 +147,13 @@
                ",HYear,HPeriod,HRemark" +
                ",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
                ",HEndDate"+
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID" +
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                ",'" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() + "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                ",'" + omodel.HEndDate + "'"+
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString()+
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
                ") ");

                if (DetailCol.Count > 0)

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBill.cs

@@ -64,7 +64,7 @@
                ",HEndDate='" + omodel.HEndDate + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +

                ",HMaintainLevID=" + omodel.HMaintainLevID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -143,12 +143,12 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" + 
                ",HYear,HPeriod,HRemark" +
                ",HCycleUnit,HCheckCycle,HBeginDate,HEndDate"+
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleID" +
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleID,HMaintainLevID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" + "','" + omodel.HMouldMaintainRuleID + "'" +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation  + "','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID +
                ") ");
                //插入子表配件信息
                foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
@@ -180,7 +180,7 @@
                          ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
                          "," + Item.HManagerID.ToString() +
                          ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString()  +"," + Item.HMaintainItem.ToString() +
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString()  +",'" + Item.HMaintainItem.ToString() + "'" +
                          ") ");
                }
                //

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainRuleBill.cs

@@ -56,6 +56,7 @@
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HMaintainLevID=" + omodel.HMaintainLevID + 
                " where HInterID=" + lngBillKey.ToString());                
                //删除关联
                //DeleteRelation(ref sReturn, lngBillKey);
@@ -116,11 +117,11 @@
                oCn.RunProc("Insert Into Sc_MouldMaintainRuleBillMain" +
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo" +
                ",HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo,HMaintainLevID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
                ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID +
                ") ");
                ////插入子表
                foreach (Model.ClsSc_MouldMaintainRuleBillSub oSub in DetailColl_Mater)

 DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs

@@ -69,7 +69,8 @@
                ",HPlanNo='" + omodel.HPlanNo + "'" +
                ",HExplanation='" + omodel.HExplanation+"'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
                ",HEquipMaintainRuleInterID="+omodel.HEquipMaintainRuleInterID.ToString()+
                ",HEquipMaintainRuleInterID=" + omodel.HEquipMaintainRuleInterID.ToString()+
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -173,11 +174,11 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
                ",HDeptID" + 
                ",HDeptID,HMaintainLevID" + 
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + 
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID +
                ") ");
                //插入配件子表
                foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)

 DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainPlanBill.cs

@@ -55,6 +55,7 @@
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation+"'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -121,11 +122,11 @@
                oCn.RunProc("Insert Into Sb_EquipMaintainPlanBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldMaintainRuleID" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldMaintainRuleID,HMaintainLevID" +
                ") "+
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'" +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID +
                ") ");
                if (DetailColl != null)
                {

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainBillMain.cs

@@ -15,5 +15,7 @@
        public string HExplanation;//       --ÕªÒª
        public string HInnerBillNo;//       --内部单据号
        public int HMouldMaintainRuleInterID;

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBillMain.cs

@@ -15,5 +15,7 @@
        public string HExplanation;//    varchar(500)   --ÕªÒª
        public string HInnerBillNo;//    varchar(50)       --内部单据号
        public int HMouldMaintainRuleID; //器具保养规程id

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainRuleBillMain.cs

@@ -10,7 +10,7 @@
        public Int64 HCheckCycle;//  int        --保养周期 
        public string HExplanation;//    varchar(500)   --ÕªÒª
        public string HInnerBillNo;//    varchar(50)       --内部单据号
        
        

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs

@@ -17,5 +17,7 @@

        public int HEquipMaintainPlanInterID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）主内码
        public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainPlanBillMain.cs

@@ -14,7 +14,7 @@
        public string HExplanation;
        public string HInnerBillNo;
        public int HMouldMaintainRuleID; //保养规程id
        
        

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}

 WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs

@@ -214,7 +214,7 @@
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from Sc_MouldMaintainRuleBillMain  where HInterID= " + HID + " ", "Sc_MouldMaintainRuleBillMain");
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainRuleBill_Edit  where HInterID= " + HID + " ", "h_v_Sc_MouldMaintainRuleBill_Edit");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在器具保养规程记录" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };

 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -26,6 +27,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
@@ -46,11 +48,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
                }

               
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)

 WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs

@@ -200,9 +200,9 @@
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from Sb_EquipMaintainRuleBillMain  where HInterID= " + HID + " ", "Sb_EquipMaintainRuleBillMain");
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipMaintainRuleBillList  where HInterID= " + HID + " ", "h_v_Sb_EquipMaintainRuleBillList");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在点检计划表" };
                return new ApiResult<DataSet> { code = -1, msg = "不存在保养规程表" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -425,6 +425,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
@@ -436,12 +437,21 @@

                ds = Sc_MouldMaintainPlanBillList_s(sWhere);

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -482,6 +482,8 @@
        {
            try
            {
                LogService.Write("生产汇报单进入同步方法，汇报单号：" + BillNo);

                string sErr = "";
                oSystemParameter.ShowBill(ref sErr);

@@ -495,6 +497,7 @@
                DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
                if (ds.Tables[0].Rows.Count <= 0)
                {
                    LogService.Write("生产汇报单回滚，汇报单号：" + BillNo + "   åŽŸå› ï¼šç”Ÿæˆç”Ÿäº§æ±‡æŠ¥å•è¿‡ç¨‹ä¸­æ²¡æœ‰æŸ¥è¯¢åˆ°å‡ºç«™å•");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生成生产汇报单过程中没有查询到出站单";
@@ -505,9 +508,10 @@

                //保存
                oCN.BeginTran();
                DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
                DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain with(nolock) where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
                if (DsTable.Tables[0].Rows.Count > 0)
                {
                    LogService.Write("生产汇报单回滚，汇报单号：" + BillNo + "   åŽŸå› ï¼šå·²å…¥åº“,请不要重复入库");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "已入库,请不要重复入库";
@@ -550,6 +554,7 @@
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess == 0)
                {
                    LogService.Write("生产汇报单回滚，汇报单号：" + BillNo + "   åŽŸå› ï¼šæ“ä½œå¤±è´¥,金蝶账号登录异常");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;
@@ -643,6 +648,7 @@
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("工序汇报单入库错误jsonRoot:" + jsonRoot);
                    LogService.Write("生产汇报单保存失败，汇报单号：" + BillNo + "   åŽŸå› ï¼š" + result);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -663,10 +669,11 @@
                result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("生产汇报单提交失败，汇报单号：" + BillNo + "   åŽŸå› ï¼š" + result1);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"生产汇报单单号：{fBillNo}，提交失败" + result;
                    objJsonResult.Message = $"生产汇报单单号：{fBillNo}，提交失败" + result1;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -674,6 +681,9 @@
                oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");

                oCN.Commit();

                LogService.Write("生产汇报单保存成功，汇报单号：" + BillNo );

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
@@ -682,6 +692,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("生产汇报单同步发生异常，汇报单号：" + BillNo + "    " + e.ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -768,6 +779,7 @@
        {
            try
            {
                LogService.Write("生产入库单进入同步方法:" + "  å…¥åº“单号：" + BillNo);
                //获取生产汇报单最大InterID和单据号
                Int64 HInterID = DBUtility.ClsPub.CreateBillID("1202", ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillNo = DBUtility.ClsPub.CreateBillCode("1202", ref DBUtility.ClsPub.sExeReturnInfo, true);
@@ -778,10 +790,11 @@
                //DataRow dr = ds.Tables[0].Rows[0];

                //判断入库的合格数量是否为0
                var DTable = oCN.RunProcReturn("select * from  Sc_StationOutBillMain where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
                var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain with(nolock) where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];

                if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
                {
                    LogService.Write("同步金蝶生产生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šåˆæ ¼æ•°é‡ä¸º0,不需要入库！");
                    objJsonResult.code = "1";
                    objJsonResult.count = 2;
                    objJsonResult.Message = "合格数量为0,不需要入库！";
@@ -827,6 +840,7 @@
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess == 0)
                {
                    LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šæ“ä½œå¤±è´¥,金蝶账号登录异常");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;
@@ -839,6 +853,7 @@

                if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                {
                    LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šæœªæ‰¾åˆ°å¯¹åº”的本地或金蝶云生产汇报单记录;1.未查询到对应的生产汇报单；2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录！");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到对应的本地或金蝶云生产汇报单记录;1.未查询到对应的生产汇报单；2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录！";
@@ -849,6 +864,7 @@
                DataRow dr1 = ds1.Tables[0].Rows[0];
                if (double.Parse(dr1[0].ToString()) <= 0)
                {
                    LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šæœªæ‰¾åˆ°å¯¹åº”的生产汇报单记录;1.未查询到对应的生产汇报单；2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录！");
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到对应的生产汇报单记录;1.未查询到对应的生产汇报单；2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录！";
@@ -868,6 +884,7 @@

                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šå½“前出站单号已入库,请不要重新入库!");
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前出站单号已入库,请不要重新入库!";
@@ -876,7 +893,7 @@
                        }

                        //判断金蝶云生产汇报单 æ•°é‡ æ˜¯å¦ å¤§äºŽ æœ«é“出站数量
                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}') 
                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain with(nolock) where HBillNo='{BillNo}') 
                        from  AIS20220308151944..T_PRD_MORPT rpt3 
                        left join AIS20220308151944..T_PRD_MORPTENTRY  rpt2 on rpt3.FID = rpt2.FID
                        left join AIS20220308151944..T_PRD_MORPTENTRY_A  rpt1 on rpt2.FID = rpt1.FID
@@ -884,6 +901,7 @@

                        if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
                        {
                            LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šé‡‘蝶云汇报数量小于本地出站数量!");
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "金蝶云汇报数量小于本地出站数量!";
@@ -896,6 +914,7 @@
                        {
                            if (item["HWYID"].ToString() == null || item["HWYID"].ToString() == "" || item["HWYID"].ToString() == "undefined")
                            {
                                LogService.Write("同步金蝶生产入库单回滚--出站单号：" + BillNo + "  å›žæ»šåŽŸå› ï¼šå”¯ä¸€ID为空，请重新手动入库或联系管理员！");
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "唯一ID为空，请重新手动入库或联系管理员！";
@@ -1045,8 +1064,8 @@
                string result = InvokeHelper.Save("PRD_INSTOCK", JsonConvert.SerializeObject(jsonRoot));//保存
                //判断保存是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("生产入库错误jsonRoot:" + jsonRoot);
                {                  
                    LogService.Write("生产入库保存错误jsonRoot:" + jsonRoot + "  å…¥åº“单号：" + BillNo);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1067,6 +1086,7 @@
                //result2 = InvokeHelper.Audit("PRD_INSTOCK", JsonConvert.SerializeObject(json));//提交
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("生产入库提交错误jsonRoot:" + jsonRoot + "  å…¥åº“单号：" + BillNo);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1076,7 +1096,7 @@
                }

                oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");

                LogService.Write("生产入库同步成功:" + "  å…¥åº“单号：" + BillNo);
                oCN.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
@@ -1086,6 +1106,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("生产入库同步发生异常:" + "  å…¥åº“单号：" + BillNo + "    " + e.ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs

@@ -55,6 +55,7 @@
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -120,12 +121,12 @@
                oCn.RunProc("Insert Into Sb_EquipMaintainRuleBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
                ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMaintainLevID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + 
                "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +
                "') ");
                "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID +
                ") ");

                //插入保养项子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub_Item Item in DetailColl_Pay)

 WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs

@@ -11,5 +11,7 @@
        public int HCheckCycle;     //--保养周期
        public string HExplanation;   // varchar(500)   --摘要
        public string HInnerBillNo;   //varchar(50)     --内部单据号

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
    }
}