设备点检记录和保养记录选设备带出默认点检规程和默认保养规程数据
6个文件已修改
93 ■■■■ 已修改文件
DAL/生产管理/模具管理/ClsSc_MouldDotCheckBill.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckBillSub.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBill.cs
@@ -67,19 +67,20 @@
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                //插入子表
                foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
                      " (HInterID,HEntryID" +
                      ",HManagerID"+
                      ",HDotCheckItem,HDotCheckPart,HClaim"+
                      ",HManagerID" +
                      ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HCloseMan,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      "," + oSub.HManagerID.ToString() +
                      "," + oSub.HManagerID.ToString() + "," + oSub.HDotCheckItemID.ToString() +
                      ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
                      ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'"+
                      ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      ") ");
                }
@@ -135,12 +136,12 @@
                    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
                      " (HInterID,HEntryID" +
                      ",HManagerID" +
                      ",HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HCloseMan,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      "," + oSub.HManagerID.ToString() +
                      "," + oSub.HManagerID.ToString() +","+ oSub.HDotCheckItemID.ToString()+
                      ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
                      ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBillSub.cs
@@ -5,8 +5,9 @@
namespace Model
{
    public class ClsSc_MouldDotCheckBillSub:DBUtility.ClsXt_BaseBillSub
    {
    {
        //============
        public int HDotCheckItemID;
        public string HDotCheckItem;//  varchar(100)  --点检项目
        public string HDotCheckPart;//  varchar(100)  --点检部位
        public string HClaim;//   varchar(100)       --具体要求
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -912,7 +912,7 @@
                ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
                ") " +
                " values('3801','3801'," + HInterID + ",'" + HBillNo + "',' getdate()'" +
                " values('3801','3801'," + HInterID + ",'" + HBillNo + "',getdate()" +
                ", '" + user + "',getdate()" +
                ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
                ", 0," + dr["HDeptID"].ToString() +  ",' ',0"  +
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -2950,7 +2950,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select ç‚¹æ£€é¡¹ç›® HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
                    ds = oCN.RunProcReturn("select HDotCheckItemID,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
@@ -2958,7 +2958,7 @@
                }
                else
                {
                    string sql1 = "select ç‚¹æ£€é¡¹ç›® HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
                    string sql1 = "select HDotCheckItemID,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
                    objJsonResult.code = "0";
WebAPI/Controllers/WebAPIController.cs
@@ -2199,28 +2199,29 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
                ds = oCN.RunProcReturn(sql, "Sb_EquipMaintainRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
                                                left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                                left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain  where HInterID=" + EquipProjectID + ") ");
                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/30/2021 17:02:49</publishTime>
      <publishTime>12/01/2021 15:39:28</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/30/2021 17:02:49</publishTime>
      <publishTime>12/01/2021 15:39:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/30/2021 17:02:48</publishTime>
      <publishTime>12/01/2021 15:39:26</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/30/2021 17:02:48</publishTime>
      <publishTime>12/01/2021 15:39:26</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:22</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:22</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/30/2021 17:02:45</publishTime>
      <publishTime>12/01/2021 15:39:22</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/30/2021 17:02:45</publishTime>
      <publishTime>12/01/2021 15:39:22</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/30/2021 17:02:43</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/30/2021 17:02:43</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/30/2021 17:02:44</publishTime>
      <publishTime>12/01/2021 15:39:21</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/30/2021 17:02:52</publishTime>
      <publishTime>12/01/2021 15:39:30</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/30/2021 17:02:52</publishTime>
      <publishTime>12/01/2021 15:39:30</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/30/2021 17:03:22</publishTime>
      <publishTime>12/01/2021 16:07:09</publishTime>
    </File>
  </ItemGroup>
</Project>