11.24凯贝奈特项目测试BUG修复

zzr99

2021-11-24 4b1b93845c6ff19b60740ebe3b27353b5902711f

11.24凯贝奈特项目测试BUG修复

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

@@ -127,22 +127,25 @@
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"'" +
                ") ");
                //插入配件子表
                foreach (Model.ClsSb_EquipMaintainPlanBillSub oSub in DetailColl)
                if (DetailColl != null)
                {
                    oCn.RunProc("Insert into Sb_EquipMaintainPlanBillSub " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HMaterNumber,HUnitID,HUnitNumber,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.HMaterNumber + "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() +
                        "," + oSub.HManagerID.ToString() + 
                      ") ");
                    //插入配件子表
                    foreach (Model.ClsSb_EquipMaintainPlanBillSub oSub in DetailColl)
                    {
                        oCn.RunProc("Insert into Sb_EquipMaintainPlanBillSub " +
                          " (HInterID,HEntryID," +
                          "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                          "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                          "HQty,HMaterID,HMaterNumber,HUnitID,HUnitNumber,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.HMaterNumber + "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() +
                            "," + oSub.HManagerID.ToString() +
                          ") ");
                    }
                }
                //插入保养项子表
                foreach (Model.ClsSc_EquipMaintainPlanBillSub_Item Item in DetailCol)

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -93,23 +93,12 @@
            DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("Delete From Gy_EquipFileBillMain  where HInterID=" + lngBillKey);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {

 WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs

@@ -77,23 +77,12 @@
            DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("Delete From Gy_EquipFileType  where HItemID=" + lngBillKey);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -113,7 +113,7 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere+ "order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList " + sWhere+ " order by hmainid desc", "h_v_Sb_EquipRepairCheckBillList");
            }
            else
            {

 WebAPI/Models/ClsGy_EquipFileMain.cs

@@ -30,8 +30,8 @@
        public string HLogo;                //√        varchar(50)    //品牌
        public int HSellSupID;              // âˆš    int        //供应商(Gy_Supplier)
        public int HMakeSupID;              // int        //制造商 (Gy_Supplier) 
        public int HEquipDotCheckRuleInterID;
        public int HEquipMaintainRuleInterID;
        public int HEquipDotCheckRuleInterID=0;
        public int HEquipMaintainRuleInterID=0;

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>10/14/2021 09:42:47</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/22/2021 14:16:51</publishTime>
      <publishTime>11/24/2021 19:23:01</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/22/2021 14:16:51</publishTime>
      <publishTime>11/24/2021 19:23:01</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/22/2021 14:16:50</publishTime>
      <publishTime>11/24/2021 19:22:59</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/22/2021 14:16:50</publishTime>
      <publishTime>11/24/2021 19:22:59</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/22/2021 14:16:48</publishTime>
      <publishTime>11/24/2021 19:22:55</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/22/2021 14:16:48</publishTime>
      <publishTime>11/24/2021 19:22:55</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>10/14/2021 09:42:44</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/22/2021 14:16:48</publishTime>
      <publishTime>11/24/2021 19:22:55</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/22/2021 14:16:48</publishTime>
      <publishTime>11/24/2021 19:22:55</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>10/14/2021 09:42:47</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/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:52</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:53</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:53</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:54</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/22/2021 14:16:47</publishTime>
      <publishTime>11/24/2021 19:22:54</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>10/14/2021 09:42:47</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/22/2021 14:16:52</publishTime>
      <publishTime>11/24/2021 19:23:04</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/22/2021 14:16:52</publishTime>
      <publishTime>11/24/2021 19:23:04</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>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>10/27/2021 13:49:58</publishTime>
      <publishTime>10/29/2021 19:50:53</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:16</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>10/14/2021 09:42:47</publishTime>
      <publishTime>08/16/2021 17:23:15</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>10/14/2021 09:42:47</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/22/2021 14:17:15</publishTime>
      <publishTime>11/24/2021 19:23:17</publishTime>
    </File>
  </ItemGroup>
</Project>