zzr99
2021-11-29 070a771bf9af8fac6c2ba7bf09efb3f8b3b04585
设备维修记录修复
7个文件已修改
562 ■■■■ 已修改文件
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs 202 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 146 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -1,4 +1,5 @@
using System;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -171,5 +172,204 @@
            return objJsonResult;
        }
        #endregion
        #region[设备保养规程编辑时获取表头数据]
        [Route("Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListCheckDetai")]
        [HttpGet]
        public ApiResult<DataSet> Sb_EquipMaintainRuleBillListCheckDetai(string HID)
        {
            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");
            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 };
        }
        #endregion
        # region 设备保养规程编辑时获取表体数据新(保养项列表、配件项列表)
        [Route("Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillSubAndSubItem")]
        [HttpGet]
        public object Sb_EquipMaintainRuleBillSubAndSubItem(string HInterID)
        {
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string Swhere = "";
            try
            {
                if (HInterID != "" || HInterID != null)
                {
                    Swhere = " and hmainid='" + HInterID + "'";
                }
                else
                {
                    Swhere = HInterID;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //获取保养项目编辑数据
                string sql = "select 保养项目ID HMaintainItemID,保养项目代码 HMaintainItemNumber,保养项目 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,负责人ID HManagerID,负责人代码 HManagerNumber,负责人名称 HManagerName,子备注2 HRemark from h_v_Sb_EquipMaintainRuleList where 1 = 1 " + Swhere + "";
                ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleList");
                //获取配件项目编辑数据
                string sql1 = "select 配件ID HMaterID,配件代码 HMaterNumber,配件名称 HMaterName,单位ID HUnitID,计量单位代码 HUnitNumber,计量单位名称 HUnitName,用量 HQty,子备注1 HRemark from h_v_Sb_EquipMaintainRuleList where 1 = 1 " + Swhere + "";
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleList");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.list = list;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region 设备保养规程表 保存/编辑
        /// <summary>
        /// 保存模具维修单
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sb_EquipMaintainRuleBill/SaveEquipMaintainRuleBillList")]
        [HttpPost]
        public object SaveEquipMaintainRuleBillList([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                DLL.ClsSb_EquipMaintainRuleBill oBill = new DLL.ClsSb_EquipMaintainRuleBill();
                List<Models.ClsSb_EquipMaintainRuleBillMain> lsmain = new List<Models.ClsSb_EquipMaintainRuleBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                //主表
                lsmain = oListModels.getObjectByJson_Sb_EquipMaintainRuleBillMain(msg2);
                foreach (Models.ClsSb_EquipMaintainRuleBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3912";
                    oItem.HBillSubType = "3912";
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod= DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //保养项表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Models.ClsSb_EquipMaintainRuleBillSub_Item> ls = new List<Models.ClsSb_EquipMaintainRuleBillSub_Item>();
                ls = oListModels.getObjectByJson_Sc_EquipMaintainRuleBillSub_Item(msg3);
                int i = 0;
                foreach (Models.ClsSb_EquipMaintainRuleBillSub_Item item in ls)
                {
                    i++;
                    item.HEntryID = i;
                    item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    item.HCloseType = false;   //关闭类型
                    item.HSourceInterID = 0;     // 源单主内码
                    item.HSourceEntryID = 0;   //源单子内码
                    item.HRelationQty = 0;     //关联数量
                    oBill.DetailColl_Pay.Add(item);
                }
                //配件项表体数据
                //按 },{来拆分数组 //去掉【和】
                msg4 = msg4.Substring(1, msg4.Length - 2);
                msg4 = msg4.Replace("\\", "");
                msg4 = msg4.Replace("\n", "");  //\n
                                                //msg2 = msg2.Replace("'", "’");
                List<Models.ClsSb_EquipMaintainRuleBillSub> ls1 = new List<Models.ClsSb_EquipMaintainRuleBillSub>();
                ls1 = oListModels.getObjectByJson_Sb_EquipMaintainRuleBillSub(msg4);
                int j = 0;
                foreach (Models.ClsSb_EquipMaintainRuleBillSub oItemSub in ls1)
                {
                    j++;
                    oItemSub.HEntryID = j;
                    //oItemSub.HCloseMan = "";       //行关闭
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    oItemSub.HSourceInterID = 0;     // 源单主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    oItemSub.HRelationQty = 0;     //关联数量
                    oBill.DetailColl_Mater.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -346,7 +346,7 @@
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark   from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
                    ds = oCN.RunProcReturn("select HManagerID1,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark  from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
                    ds = oCN.RunProcReturn("select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType  from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
@@ -355,7 +355,7 @@
                else
                {
                    //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark  from Sc_MouldRepairWorkBillSub where 1 = 1 ";
                    string sql1 = "select HManagerID1,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark  from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
                    string sql1 = "select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, 表体维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark ,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipRepairWorkBillList_Edit");
                    objJsonResult.code = "0";
@@ -375,6 +375,32 @@
        }
        #endregion
        #region[新增编辑设备维修按选单号加载表体数据]
        [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillSubByHMainSourceBillNo")]
        [HttpGet]
        public object Sb_EqpRepairWorkBillSubByHMainSourceBillNo(string HMainSourceBillNo)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select 单据号,hmainid,hsubid,HBillType  from h_v_Sb_EquipConkBookBillList where 单据号= '" + HMainSourceBillNo+"'", "h_v_Sb_EquipConkBookBillList");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region [设备维修单删除功能]
        /// <summary>
        /// 模具维修单删除功能
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
@@ -33,5 +33,142 @@
        }
        #endregion   自定义方法
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sb_EquipMaintainPlanBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + omodel.HMaker + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HCycleUnit='" + omodel.HCycleUnit + "'" +
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                DeleteBillSub2(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                //插入保养项子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub_Item Item in DetailColl_Pay)
                {
                    oCn.RunProc("Insert into Sb_EquipMaintainRuleBillSub_Item" +
                          " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
                          ",HMaintainPart,HClaim" +
                          ",HManagerID" +
                          ",HCloseMan,HCloseType,HRemark" +
                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                          ") values("
                          + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
                          ",'" + 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() +
                          ") ");
                }
                //插入配件子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipMaintainRuleBillSub " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      ") ");
                }
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Sb_EquipMaintainRuleBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
                ") " +
                " 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 +
                "') ");
                //插入保养项子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub_Item Item in DetailColl_Pay)
                {
                    oCn.RunProc("Insert into Sb_EquipMaintainRuleBillSub_Item" +
                          " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
                          ",HMaintainPart,HClaim" +
                          ",HManagerID" +
                          ",HCloseMan,HCloseType,HRemark" +
                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                          ") values("
                          + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
                          ",'" + 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() +
                          ") ");
                }
                //插入配件子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub oSub in DetailColl_Mater)
                {
                    string sql = "Insert into Sb_EquipMaintainRuleBillSub " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + ",0" +
                      ") ";
                    oCn.RunProc(sql);
                }
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
    }
}
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -82,7 +82,7 @@
                       ") values("
                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HRepairID1.ToString() + ",'"+ oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                       ") ");
                }
                //
@@ -141,7 +141,7 @@
                       ") values("
                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HRepairID1.ToString() + ",'" + oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                      "," + oSub.HRepairID.ToString() + ",'" + oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                       ")");
                    oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub " +
                       " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -150,7 +150,7 @@
                       ") values("
                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HRepairID1.ToString() + ",'"+ oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                       ") ");
                }
                //
@@ -257,7 +257,7 @@
                    //===================================================
                    
                    oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRepairExplanation"]);
                    oSub.HRepairID1 = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
                    oSub.HRepairID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRepairID"]);
                    oSub.HEmpID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEmpID"]);
WebAPI/ListModels.cs
@@ -1026,6 +1026,41 @@
            return list;
        }
        /// <summary>
        /// 设备保养规程 主表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipMaintainRuleBillMain> getObjectByJson_Sb_EquipMaintainRuleBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipMaintainRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 设备保养规程 配件子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipMaintainRuleBillSub> getObjectByJson_Sb_EquipMaintainRuleBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipMaintainRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// 设备保养规程 保养子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipMaintainRuleBillSub_Item> getObjectByJson_Sc_EquipMaintainRuleBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipMaintainRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipMaintainRuleBillSub_Item>>(jsonString);
            return list;
        }
        ///设备点检记录表 子表
        ///ClsSb_EquipDotCheckBillSub
        public List<Model.ClsSb_EquipDotCheckBillSub> getObjectByJson_Sb_EquipDotCheckBillSub(string jsonString)
WebAPI/Models/ClsSb_EquipRepairWorkBillSub.cs
@@ -14,7 +14,7 @@
        public Int64 HEmpID; // int --负责人
        public string HRepairExplanation; // varchar(500)维修要求
        public Int64 HManagerID1; // int --表体负责人ID
        public Int64 HRepairID1; // int --表体维修项目ID
        public Int64 HManagerID; // int --表体负责人ID
        public Int64 HRepairID; // int --表体维修项目ID
    }
}
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/26/2021 17:29:39</publishTime>
      <publishTime>11/29/2021 18:37:32</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/26/2021 17:29:39</publishTime>
      <publishTime>11/29/2021 18:37:32</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/26/2021 17:29:37</publishTime>
      <publishTime>11/29/2021 18:37:29</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/26/2021 17:29:37</publishTime>
      <publishTime>11/29/2021 18:37:29</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/26/2021 17:29:33</publishTime>
      <publishTime>11/29/2021 18:37:23</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/26/2021 17:29:33</publishTime>
      <publishTime>11/29/2021 18:37:23</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/19/2021 09:43:58</publishTime>
      <publishTime>08/16/2021 17:23:13</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/26/2021 17:29:33</publishTime>
      <publishTime>11/29/2021 18:37:24</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/26/2021 17:29:33</publishTime>
      <publishTime>11/29/2021 18:37:24</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/26/2021 17:29:31</publishTime>
      <publishTime>11/29/2021 18:37:21</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/26/2021 17:29:31</publishTime>
      <publishTime>11/29/2021 18:37:21</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/26/2021 17:29:32</publishTime>
      <publishTime>11/29/2021 18:37:22</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/26/2021 17:29:32</publishTime>
      <publishTime>11/29/2021 18:37:22</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/26/2021 17:29:32</publishTime>
      <publishTime>11/29/2021 18:37:22</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/26/2021 17:29:32</publishTime>
      <publishTime>11/29/2021 18:37:22</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/26/2021 17:29:43</publishTime>
      <publishTime>11/29/2021 18:37:36</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/26/2021 17:29:43</publishTime>
      <publishTime>11/29/2021 18:37:36</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +204,166 @@
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>11/01/2021 09:26:33</publishTime>
      <publishTime>10/29/2021 19:50:53</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/26/2021 17:30:29</publishTime>
      <publishTime>11/29/2021 18:37:45</publishTime>
    </File>
  </ItemGroup>
</Project>