优化pda设备保养记录单新增页面,保存后端时,制单人不是当前登录人,器具档案增加字段 HInitLife money //上线初始化寿命,修改工序流...

zrg

2024-08-15 cc0f022b6538d5e40067b943bc4fcb6e15567f21

优化pda设备保养记录单新增页面,保存后端时,制单人不是当前登录人,器具档案增加字段  HInitLife money //上线初始化寿命,修改工序流转卡下推设备点检参数表 查询方法

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1420,6 +1420,7 @@
                long HSPID = mainList[0].HSPID;
                Double HDesignLife = mainList[0].HDesignLife;
                Double HUseLife = mainList[0].HUseLife;
                Double HInitLife = mainList[0].HInitLife;//上线初始化寿命
                Double HLeaveLife = mainList[0].HLeaveLife;
                Double HProdQty = mainList[0].HProdQty;
                Double HProdWeight = mainList[0].HProdWeight;
@@ -1451,7 +1452,7 @@
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass,HNowWHID,HNowSPID) " +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife) " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -1461,7 +1462,7 @@
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ") ");
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -1568,6 +1569,7 @@
                long HSPID = mainList[0].HSPID;
                Double HDesignLife = mainList[0].HDesignLife;
                Double HUseLife = mainList[0].HUseLife;
                Double HInitLife = mainList[0].HInitLife;
                Double HLeaveLife = mainList[0].HLeaveLife;
                Double HProdQty = mainList[0].HProdQty;
                Double HProdWeight = mainList[0].HProdWeight;
@@ -1643,7 +1645,8 @@
                ",HMadeSupID=" + HMadeSupID +
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                " where HInterID=" + HInterID.ToString());
                ",HInitLife='" + HInitLife +
                "' where HInterID=" + HInterID.ToString());

                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Controllers/LMESController.cs

@@ -1708,7 +1708,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery_TechParam where hmainid ='" + hinterid + "' and HEntryID='" + HEntryID + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(" exec h_p_Sc_ProcessExchangeBillQuery_TechParam '" + hinterid + "' and HEntryID='" + HEntryID + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
            }
            catch (Exception e)
            {

 WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs

@@ -635,7 +635,7 @@
                foreach (Model.ClsSb_EquipMaintainBillMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    UserName = oItem.HMaker;  //制单人
                    DBUtility.ClsPub.CurUserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3901";
                    oItem.HBillSubType = "3901";


 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -477,7 +477,7 @@
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);                  
                    //部门,发现人,负责人,设备
                    _ = SendDingDingAsync(oBill.omodel.HDeptID, oBill.omodel.HEmpID, oBill.omodel.HManagerID, oBill.omodel.HEquipID,2);
                }
@@ -819,7 +819,10 @@
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);    
                    //反写维修记录单关闭
                    string sql = "Update Sb_EquipRepairWorkBillMain set HCloseMan='关联验收单自动关闭',HCloseDate=GETDATE(),HBillStatus=3,HCloseType = 1 Where HInterID=" + oBill.omodel.HMainSourceInterID.ToString();
                    ds = oCN.RunProcReturn(sql, "Sb_EquipRepairWorkBillMain");
                    //部门,发现人,负责人,设备
                    _ = SendDingDingAsync(oBill.omodel.HDeptID, oBill.omodel.HEmpID, oBill.omodel.HManagerID, oBill.omodel.HEquipID, 3);
                }
@@ -1323,8 +1326,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileBillList where HBarCode= '" + HBarCode + "'", "Gy_EquipFileBillMain");
                //得到信息最新的
                ds = oCN.RunProcReturn("select  * from h_v_Gy_EquipFileBillList where HBarCode= '" + HBarCode + "'  order by 故障登记单ID desc", "Gy_EquipFileBillMain");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
@@ -1334,6 +1337,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if ( ds.Tables[0].Rows.Count > 1)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "该设备出现多个故障登记单,请手动选着";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";

 WebAPI/Models/Gy_Mould.cs

@@ -68,5 +68,7 @@
        public int HNowWHID { get; set; }
        public int HNowSPID { get; set; }

        public double HInitLife { get; set; }

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-08-13T06:04:05.8532501Z;True|2024-08-13T11:23:40.5242910+08:00;</History>
    <History>True|2024-08-15T03:05:05.5377207Z;True|2024-08-15T10:51:59.8586373+08:00;True|2024-08-15T09:34:19.6954590+08:00;True|2024-08-15T09:27:30.4910263+08:00;True|2024-08-14T17:10:23.3978810+08:00;True|2024-08-14T17:03:22.1530532+08:00;True|2024-08-14T15:01:12.5015047+08:00;True|2024-08-14T10:54:40.0433008+08:00;True|2024-08-14T10:54:29.3944984+08:00;True|2024-08-14T09:39:23.8085209+08:00;True|2024-08-14T09:23:48.5190887+08:00;True|2024-08-13T14:04:05.8532501+08:00;True|2024-08-13T11:23:40.5242910+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/13/2024 14:02:50</publishTime>
      <publishTime>08/15/2024 11:04:55</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/13/2024 14:02:50</publishTime>
      <publishTime>08/15/2024 11:04:55</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/13/2024 14:02:49</publishTime>
      <publishTime>08/15/2024 11:04:54</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/13/2024 14:02:49</publishTime>
      <publishTime>08/15/2024 11:04:54</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/13/2024 14:02:47</publishTime>
      <publishTime>08/15/2024 11:04:51</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/13/2024 14:02:47</publishTime>
      <publishTime>08/15/2024 11:04:51</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/13/2024 14:02:47</publishTime>
      <publishTime>08/15/2024 11:04:51</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/13/2024 14:02:47</publishTime>
      <publishTime>08/15/2024 11:04:51</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/13/2024 14:02:45</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/13/2024 14:02:45</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/13/2024 14:02:45</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/13/2024 14:02:45</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/13/2024 14:02:46</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/13/2024 14:02:46</publishTime>
      <publishTime>08/15/2024 11:04:50</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/13/2024 14:02:56</publishTime>
      <publishTime>08/15/2024 11:04:59</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/13/2024 14:02:56</publishTime>
      <publishTime>08/15/2024 11:04:59</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/13/2024 14:04:05</publishTime>
      <publishTime>08/15/2024 11:05:04</publishTime>
    </File>
  </ItemGroup>
</Project>