设备保养记录单选择原单

yangle

2022-11-30 aea7384c05c804ebe3778c8a7215b79eba2c954e

设备保养记录单选择原单

 Model/Model.csproj

@@ -566,6 +566,7 @@
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairRequestBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSendWorkBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSendWorkBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairWorkBillSub_Mater.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_EquipMaintainBillSub_Item.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_ICMOBillMain.cs" />

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

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Model
{
    public class ClsSb_EquipRepairWorkBillSub_Mater : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HMaterID { get; set; }
        public string HMaterNumber { get; set; }
        public string HMaterName{ get; set; }
        public string HMaterModel{ get; set; }
        public double HQty{ get; set; }
        public double HQtyMust{ get; set; }
        public Int64 HUnitID{ get; set; }
        public string HUnitNumber{ get; set; }
        public string HUnitName{ get; set; }
        public Int64 HManagerID{ get; set; }
        public string HManagerNumber{ get; set; }
        public string HManagerName{ get; set; }
    }
}

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -383,7 +383,7 @@
            {

                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
                ds = oCN.RunProcReturn("select  * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
                //写入信息
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{

 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs

@@ -44,22 +44,12 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -237,6 +237,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();


            //string UserName = "";
@@ -330,6 +331,30 @@
                    oBill.DetailColl.Add(oItemSub);

                }

                //配件表体数据
                //按 },{来拆分数组 //去掉【和】
                //msg5 = msg5.Substring(1, msg5.Length - 2);
                msg5 = msg5.Replace("\\", "");
                msg5 = msg5.Replace("\n", "");  //\n
                                                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSb_EquipRepairWorkBillSub_Mater> ls1 = new List<Model.ClsSb_EquipRepairWorkBillSub_Mater>();
                ls1 = JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub_Mater>>(msg5);
                int j = 0;
                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oItemSub in ls1)
                {

                    j++;
                    oItemSub.HEntryID = i;
                    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;
@@ -386,35 +411,37 @@
        }
        #endregion

        #region[设备维修列表编辑时获取表体数据]
        #region[设备维修列表编辑时获取表体数据(维修列表、配件列表)]
        [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai")]
        [HttpGet]
        public object Sb_EqpRepairWorkBillListProjectDetai(string sqlWhere)
        public object Sb_EqpRepairWorkBillListProjectDetai(string HInterID)
        {
            DataSet ds;
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string sqlWhere = "";
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                if (HInterID != "" || HInterID != null)
                {
                    //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark   from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
                    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 = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    sqlWhere = " and hmainid='" + HInterID + "'";
                }
                else
                {
                    //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark  from Sc_MouldRepairWorkBillSub 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";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    sqlWhere = HInterID;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
              
                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 where 1 = 1 " + sqlWhere , "h_v_Sc_EquipRepairWorkBillList_Edit");
                string sql1 = "select * from h_v_Sb_EquipRepairWorkBillSub_Mater where 1 = 1 " + sqlWhere;
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipRepairWorkBillSub_Mater");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;

            }
            catch (Exception e)
            {

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -280,22 +280,13 @@

                ds = Sc_MouldDotCheckPlanBillList_s(sWhere);

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
              
            }
            catch (Exception ex)
            {

 WebAPI/Controllers/WebAPIController.cs

@@ -3179,9 +3179,9 @@
        /// <returns></returns>
        [Route("Web/GetMaintainItemtemByEquipProjectID")]
        [HttpGet]
        public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
        public object GetMaintainItemtemByEquipProjectID(string EquipProjectID)
        {
            if (EquipProjectID <= 0)
            if (EquipProjectID == null)
            {
                objjson.code = "0";
                objjson.count = 0;

 WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs

@@ -9,6 +9,7 @@
    {
        public Models.ClsSb_EquipRepairWorkBillMain omodel = new Models.ClsSb_EquipRepairWorkBillMain();
        public List<Models.ClsSb_EquipRepairWorkBillSub> DetailColl = new List<Models.ClsSb_EquipRepairWorkBillSub>();
        public List<Model.ClsSb_EquipRepairWorkBillSub_Mater> DetailColl_Mater = new List<Model.ClsSb_EquipRepairWorkBillSub_Mater>();

        public ClsSb_EquipRepairWorkBill()
        {
@@ -71,6 +72,8 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //删除配件数据
                oCn.RunProc("delete from Sb_EquipRepairWorkBillSub_Mater where HInterID="+ lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
@@ -85,6 +88,22 @@
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() + 
                       ") ");
                }

                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub_Mater " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust," +
                      "HManagerID ) 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() +
                      "," + oSub.HManagerID.ToString() + ") ");
                }

                //
                //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
                //{
@@ -153,6 +172,21 @@
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                       ") ");
                }

                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub_Mater " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust," +
                      "HManagerID ) 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() +
                      "," + oSub.HManagerID.ToString() + ") ");
                }
                //
                //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
                //{

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>x86</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>E:\网页发布\WEBAPI</PublishUrl>
    <PublishUrl>D:\网站发布\智云MESWMS\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>