网页版 和 PDA版 设备点检表和器具点检表 增加 字段,新增器具点检PDA模块
12个文件已修改
274 ■■■■ 已修改文件
DAL/生产管理/模具管理/ClsSc_MouldDotCheckBill.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckBillMain.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckBillSub.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillMain.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillSub.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipDotCheckBill.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBill.cs
@@ -60,7 +60,11 @@
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HLastResult='" + omodel.HLastResult + "'" +
                ",HErrNote='" + omodel.HErrNote + "'" +
                ",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
                ",HShiftsID=" + omodel.HShiftsID +
                ",HDotCheckNote='" + omodel.HDotCheckNote + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -73,18 +77,19 @@
                foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
                      " (HInterID,HEntryID" +
                      ",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.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() +
                      ") ");
                     " (HInterID,HEntryID" +
                     ",HManagerID" +
                     ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                     ",HCloseMan,HCloseType,HRemark" +
                     ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                     ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                     ") values("
                     + omodel.HInterID.ToString() + "," + oSub.HEntryID.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() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                     ") ");
                }
                ////配件项目
@@ -141,12 +146,13 @@
                ",HMouldID,HBeginDate"+
                ",HEndDate,HPlanNo,HPlanInterID" +
                ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
                ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HDotCheckNote" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                ",'" + omodel.HEndDate + "','" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldDotCheckRuleID +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldDotCheckRuleID + ",'" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HDotCheckNote + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
@@ -157,12 +163,13 @@
                      ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HCloseMan,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.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() +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                      ") ");
                }
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBill.cs
@@ -70,6 +70,11 @@
                ",HExplanation='" + omodel.HExplanation+"'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
                ",HEquipDotCheckRuleInterID="+omodel.HEquipDotCheckRuleInterID+
                ",HLastResult='" + omodel.HLastResult + "'" +
                ",HErrNote='" + omodel.HErrNote + "'" +
                ",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
                ",HShiftsID=" + omodel.HShiftsID +
                ",HDotCheckNote='" + omodel.HDotCheckNote + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -80,18 +85,18 @@
                foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sb_EquipDotCheckBillSub " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim," +
                      "HManagerID,HManagerNumber" +
                      ") 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.HDotCheckItemID + "','" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
                      ") ");
                     " (HInterID,HEntryID," +
                     "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                     "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                     "HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim," +
                     "HManagerID,HManagerNumber,HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                     ") 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.HDotCheckItemID + "','" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
                     "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                     ") ");
                }
                //
                //foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
@@ -165,10 +170,11 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipDotCheckRuleInterID" +
                ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HDotCheckNote" +
                ") "+
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipDotCheckRuleInterID.ToString()+
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipDotCheckRuleInterID.ToString() + ",'" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HDotCheckNote + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
@@ -178,13 +184,13 @@
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim," +
                      "HManagerID,HManagerNumber" +
                      "HManagerID,HManagerNumber,HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                      ") 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.HDotCheckItemID+"','"+oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                      ") ");
                }
                //点检完成,反写设备点检计划单子表是否点检标记
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBillMain.cs
@@ -14,5 +14,11 @@
        public string HExplanation;//   varchar(500)     --ÕªÒª 
        public string HInnerBillNo;//   varchar(50)     --内部单据号
        public string HMouldDotCheckRuleID;//  å™¨å…·ç‚¹æ£€è§„程ID
        public string HLastResult;// æœ€ç»ˆç»“论(OK,NG)
        public string HErrNote;// å¼‚常情况记录
        public string HBigSafeNote;// é‡å¤§å®‰å…¨é𐿂£è®°å½•
        public Int64 HShiftsID;// ç”Ÿäº§ç­æ¬¡ï¼ˆGy_Shifts)
        public string HDotCheckNote;// ç‚¹æ£€æ•°æ®
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBillSub.cs
@@ -13,5 +13,8 @@
        public string HClaim;//   varchar(100)       --具体要求
        public long HManagerID;// int           --负责人id(h_v_IF_Employee)
        public Int64 HDotCheckItemClassID;// ç‚¹æ£€é¡¹ç›®åˆ†ç±»(gy_DotCheckItemClass)
        public Int64 HDotCheckItemMethodID;// ç‚¹æ£€æ–¹æ³•(gy_DotCheckItemMethod)
        public string HDotCheckResult;// ç‚¹æ£€ç»“果(?,X)
    }
}
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillMain.cs
@@ -19,5 +19,11 @@
        public int HEquipDotCheckPlanInterID; //设备点检计划单(Sb_EquipDotCheckPlanBillSub_Plan)主内码
        public int HEquipDotCheckPlanEntryID; //设备点检计划单(Sb_EquipDotCheckPlanBillSub_Plan)子内码
        public string HLastResult;// æœ€ç»ˆç»“论(OK,NG)
        public string HErrNote;// å¼‚常情况记录
        public string HBigSafeNote;// é‡å¤§å®‰å…¨é𐿂£è®°å½•
        public Int64 HShiftsID;// ç”Ÿäº§ç­æ¬¡ï¼ˆGy_Shifts)
        public string HDotCheckNote;// ç‚¹æ£€æ•°æ®
    }
}
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillSub.cs
@@ -25,7 +25,10 @@
        public string HUnitName;
        public Int64 HManagerID;
        public string HManagerNumber;
        public string HManagerName;
        public string HManagerName;
        public Int64 HDotCheckItemClassID;// ç‚¹æ£€é¡¹ç›®åˆ†ç±»(gy_DotCheckItemClass)
        public Int64 HDotCheckItemMethodID;// ç‚¹æ£€æ–¹æ³•(gy_DotCheckItemMethod)
        public string HDotCheckResult;// ç‚¹æ£€ç»“果(?,X)
    }
}
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -382,7 +382,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select ç‚¹æ£€é¡¹ç›®ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart ,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName  from h_v_Sb_EquipDotCheckBillList", "h_v_Sb_EquipDotCheckBillList");
                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBill_Edit", "h_v_Sb_EquipDotCheckBill_Edit");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
@@ -390,9 +390,9 @@
                }
                else
                {
                    string sql1 = "select ç‚¹æ£€é¡¹ç›®ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName  from h_v_Sb_EquipDotCheckBillList where 1 = 1 ";
                    string sql1 = "select * from h_v_Sb_EquipDotCheckBill_Edit where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBill_Edit");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -5798,7 +5798,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //获取点检项目编辑数据
                ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckBillSub");
                ds = oCN.RunProcReturn("select * from h_v_Sc_MouldDotCheckBill_Edit where 1=1 " + sqlWhere, "h_v_Sc_MouldDotCheckBill_Edit");
                //获取配件项目编辑数据
                ds1 = oCN.RunProcReturn(@"select b.HMaterID,  mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID
                    ,u2.hnumber HUnitNumber,u2.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark 
@@ -5811,7 +5811,7 @@
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = null;
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = list;
            }
@@ -6244,7 +6244,48 @@
        #endregion
        #region æ ¹æ®å™¨å…·æ¡ç æŸ¥æ‰¾å™¨å…·æ¡£æ¡ˆä¿¡æ¯PDA
        [Route("QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown")]
        [HttpGet]
        public object txtHBarCode_KeyDown(string HBarCode)
        {
            try
            {
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条形码不能为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from Gy_MouldFileMain  where HNumber= '" + HBarCode + "'", "Gy_MouldFileMain");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到器具信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region æ¨¡å…·æŠ¥åºŸå…¥åº“单
WebAPI/Controllers/WebAPIController.cs
@@ -11469,6 +11469,117 @@
        }
        /// <summary>
        /// æ ¹æ®å™¨å…·å¸¦å‡ºé¡¹ç›®
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetItemByMouldFile")]
        [HttpGet]
        public object GetItemByMouldFile(int MouldProjectID, string Type, string HDate)
        {
            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "产品器具未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                string HView = "";
                switch (Type)
                {
                    case "DJ":
                        HView = "h_v_QJ_GetDotCheckItemList";
                        break;
                    default:
                        objjson.code = "0";
                        objjson.count = 0;
                        objjson.Message = "设备模块类型错误!";
                        objjson.data = null;
                        return objjson;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
                string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + MouldProjectID + "','" + Type + "','" + HDate + "'");
                ds = oCN.RunProcReturn(sql, HView);
                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;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// æ ¹æ®å™¨å…·ç‚¹æ£€è®¡åˆ’带出项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetItemByMouldDotCheckPlan")]
        [HttpGet]
        public object GetItemByMouldDotCheckPlan(int HInterID)
        {
            if (HInterID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "产品器具点检计划未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                string sql = string.Format(@"select * from  h_v_QJ_GetDotCheckItemList where ç‚¹æ£€è®¡åˆ’ID = " + HInterID );
                ds = oCN.RunProcReturn(sql, "h_v_QJ_GetDotCheckItemList");
                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;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// æŸ¥è¯¢å„类设备单据列表(设备点检,设备维修,设备保养......)
        /// </summary>
        /// <returns></returns>
@@ -11575,7 +11686,7 @@
                string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain  a 
                                    left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID 
                                    left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
                                    left join Gy_DotCheck c on c.HItemID=b.HDotCheckItemID
                                     left join Gy_Employee e on e.HItemID=b.HManagerID
                                    where a.HInterID=" + HDotCheckRuleInterID);
                ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
WebAPI/DLL/ClsSb_EquipDotCheckBill.cs
@@ -115,11 +115,12 @@
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo" +
                ",HDeptID,HQty,HEquipDotCheckRuleInterID" +
                ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HDotCheckNote" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
               ",'" + omodel.HDeptID + "'," + omodel.HQty + "," + omodel.HEquipDotCheckRuleInterID +
               ",'" + omodel.HDeptID + "'," + omodel.HQty + "," + omodel.HEquipDotCheckRuleInterID + ",'" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HDotCheckNote + "'" +
                ") ");
                //插入子表
                foreach (Models.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
@@ -130,12 +131,13 @@
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HDotCheckItem,HDotCheckPart,HClaim," +
                      "HManagerID,HManagerNumber,HDotCheckResult,HDotCheckItemID " +
                      ",HDotCheckItemClassID,HDotCheckItemMethodID" +
                      ") 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.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim +
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "','" + oSub.HDotCheckResult + "'," + oSub.HDotCheckItemID +
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "','" + oSub.HDotCheckResult + "'," + oSub.HDotCheckItemID + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID +
                      ") ");
                }
                //更新点检计划子表关联标记
WebAPI/Models/ClsSb_EquipDotCheckBillMain.cs
@@ -17,5 +17,11 @@
        public long HDeptID;//     int    --部门ID
        public decimal HQty; //数量
        public Int64 HEquipDotCheckRuleInterID; //点检规程
        public string HLastResult;// æœ€ç»ˆç»“论(OK,NG)
        public string HErrNote;// å¼‚常情况记录
        public string HBigSafeNote;// é‡å¤§å®‰å…¨é𐿂£è®°å½•
        public Int64 HShiftsID;// ç”Ÿäº§ç­æ¬¡ï¼ˆGy_Shifts)
        public string HDotCheckNote;// ç‚¹æ£€æ•°æ®
    }
}
WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
@@ -27,5 +27,8 @@
        public string HManagerNumber;
        public string HManagerName;
        public string HDotCheckResult;
        public Int64 HDotCheckItemClassID;// ç‚¹æ£€é¡¹ç›®åˆ†ç±»(gy_DotCheckItemClass)
        public Int64 HDotCheckItemMethodID;// ç‚¹æ£€æ–¹æ³•(gy_DotCheckItemMethod)
    }
}