yangle
2022-12-22 1985f4237cdb82bd217801a810cea86a8c3c5f0e
点检规程单据列表  删除功能
点检计划单 选 点检规程 带出规程信息
8个文件已修改
3个文件已添加
606 ■■■■■ 已修改文件
DAL/生产管理/模具管理/ClsSc_MouldDotCheckPlanBill.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/模具管理/ClsSc_MouldDotCheckRuleBill.cs 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckPlanBillMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckPlanBillSub_Item.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckRuleBillSub_Item.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs 346 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckPlanBill.cs
@@ -9,6 +9,7 @@
    {
        public Model.ClsSc_MouldDotCheckPlanBillMain omodel = new Model.ClsSc_MouldDotCheckPlanBillMain();
        public List<Model.ClsSc_MouldDotCheckPlanBillSub> DetailColl = new List<Model.ClsSc_MouldDotCheckPlanBillSub>();
        public List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> DetailCol = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();
        public ClsSc_MouldDotCheckPlanBill()
        {
@@ -51,6 +52,7 @@
                    //========================================
                ",HCycleUnit='" + omodel.HCycleUnit + "'" +
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HMouldDotCheckRuleID=" + omodel.HMouldDotCheckRuleID +
                ",HMouldID=" + omodel.HMouldID.ToString() +
@@ -65,6 +67,7 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                oCn.RunProc("delete from Sc_MouldDotCheckPlanBillSub_Item where HInterID=" + lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
@@ -82,6 +85,22 @@
                      ",'" + 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() +
                      ") ");
                }
                //配件项目
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oSub in DetailCol)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub_Item " +
                    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ",HMaterID,HUnitID" +
                    ",HQty,HQtyMust" +
                    ") values("
                    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + 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.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
                    ") ");
                }
                //
                //foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
@@ -121,15 +140,15 @@
                ",HYear,HPeriod,HRemark" +
                ",HMouldID,HBeginDate"+
                ",HEndDate,HCycleUnit,HCheckCycle" +
                ",HInnerBillNo,HExplanation" +
                ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                ",'" + omodel.HEndDate + "','" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + 
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" + "," + omodel.HMouldDotCheckRuleID +
                ") ");
                //插入子表
                //插入子表    //点检项目
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub " +
@@ -146,6 +165,23 @@
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      ") ");
                }
                //配件项目
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oSub in DetailCol)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckPlanBillSub_Item " +
                    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ",HMaterID,HUnitID" +
                    ",HQty,HQtyMust" +
                    ") values("
                    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + 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.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
                    ") ");
                }
                //
                //foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
                //{
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckRuleBill.cs
@@ -8,12 +8,13 @@
    public class ClsSc_MouldDotCheckRuleBill : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsSc_MouldDotCheckRuleBillMain omodel = new Model.ClsSc_MouldDotCheckRuleBillMain();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub> DetailColl = new List<Model.ClsSc_MouldDotCheckRuleBillSub>();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub> DetailCol = new List<Model.ClsSc_MouldDotCheckRuleBillSub>();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> DetailColl = new List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>();
        public ClsSc_MouldDotCheckRuleBill()
        {
            base.MvarItemKeySub = "Sc_MouldDotCheckRuleBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub2 = "Sc_MouldDotCheckRuleBillSub_Item";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Sc_MouldDotCheckRuleBillMain";
@@ -58,9 +59,10 @@
                //DeleteRelation(ref sReturn, lngBillKey);
                ////删除子表
                DeleteBillSub(lngBillKey);
                oCn.RunProc("delete from Sc_MouldDotCheckRuleBillSub_Item where HInterID=" + lngBillKey);
                ////插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailColl)
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailCol)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -74,6 +76,21 @@
                      "," + oSub.HDotCheckItemID.ToString() + ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'," + oSub.HManagerID.ToString() +
                      ") ");
                }
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub_Item oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub_Item " +
                    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ",HMaterID,HUnitID" +
                    ",HQty,HQtyMust" +
                    ") values("
                    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + 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.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
                    ") ");
                }
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
@@ -106,7 +123,7 @@
                
                ") ");
                ////插入子表
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailColl)
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailCol)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
                     " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -119,6 +136,20 @@
                     "," + oSub.HDotCheckItemID.ToString() + ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'," + oSub.HManagerID.ToString() +
                     ") ");
                }
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub_Item oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub_Item " +
                    " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                    ",HMaterID,HUnitID" +
                    ",HQty,HQtyMust" +
                    ") values("
                    + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + 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.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                    "," + oSub.HQty.ToString() + "," + oSub.HQtyMust.ToString() +
                    ") ");
                }
                sReturn = "新增单据成功!";
                oCn.Commit();
@@ -181,7 +212,7 @@
                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Sc_MouldDotCheckRuleBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldDotCheckRuleBillSub");
                DetailColl.Clear();//清空
                DetailCol.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsSc_MouldDotCheckRuleBillSub oSub = new Model.ClsSc_MouldDotCheckRuleBillSub();
@@ -205,7 +236,7 @@
                    oSub.HClaim = DsSub.Tables[0].Rows[0]["HClaim"].ToString().Trim();
                    oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
                   
                    DetailColl.Add(oSub);
                    DetailCol.Add(oSub);
                }
                sReturn = "显示单据成功!";
                return true;
Model/Model.csproj
@@ -518,6 +518,7 @@
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckBillMain.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckBillSub.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckPlanBillMain.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckPlanBillSub_Item.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckPlanBillSub.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckRuleBillMain.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckRuleBillSub.cs" />
@@ -534,6 +535,7 @@
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainPlanBillSub.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainRuleBillMain.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainRuleBillSub.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldDotCheckRuleBillSub_Item.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainRuleBillSub_Item.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMoveStockStepOutBillSub.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMoveStockStepOutBillMain.cs" />
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckPlanBillMain.cs
@@ -15,6 +15,7 @@
        public long HCheckCycle;//  int    --点检周期    
        public string HExplanation;//   varchar(500)    --ÕªÒª
        public string HInnerBillNo;//    varchar(50)   --内部单据号
        public int HMouldDotCheckRuleID;//器具点检规程id
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckPlanBillSub_Item.cs
New file
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_MouldDotCheckPlanBillSub_Item : DBUtility.ClsXt_BaseBillSub
    {
        //============
        public Int64 HMaterID;//    int       --配件ID
        public Int64 HUnitID;//     int     --计量单位
        public double HQty;//       dec(18,8)       --用量
        public double HQtyMust;//    dec(18,8)     --标准用量(暂时隐藏)
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckRuleBillSub_Item.cs
New file
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_MouldDotCheckRuleBillSub_Item : DBUtility.ClsXt_BaseBillSub
    {
        //============
        public Int64 HMaterID;//    int       --配件ID
        public Int64 HUnitID;//     int     --计量单位
        public double HQty;//       dec(18,8)       --用量
        public double HQtyMust;//    dec(18,8)     --标准用量(暂时隐藏)
    }
}
WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
New file
@@ -0,0 +1,346 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.MJGL
{
    public class Sc_MouldDotCheckRuleBillController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态(新增,修改,浏览,更新单价,变更)
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        #region å™¨å…·ç‚¹æ£€è§„程单列表
        [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleList")]
        [HttpGet]
        public object Sc_MouldDotCheckRuleList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //反序列化传递的值
                //HlpBill com = JsonConvert.DeserializeObject<HlpBill>(sWhere.ToString());
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckRuleBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Sc_MouldDotCheckRuleBillList where 1 = 1" + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å™¨å…·ç‚¹æ£€è§„程 ä¿å­˜/编辑
        /// <summary>
        /// ä¿å­˜æ¨¡å…·ç»´ä¿®å•
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBillEdit")]
        [HttpPost]
        public object Sc_MouldDotCheckRuleBillEdit([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckRuleBill_Edit", 1, false, msg5))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DBUtility.ClsPub.CurUserName = msg5;//获取当前登录人
                DAL.ClsSc_MouldDotCheckRuleBill oBill = new DAL.ClsSc_MouldDotCheckRuleBill();
                List<Model.ClsSc_MouldDotCheckRuleBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckRuleBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                //主表
                lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckRuleBillMain(msg2);
                foreach (Model.ClsSc_MouldDotCheckRuleBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3834";
                    oItem.HBillSubType = "3834";
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //点检项表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_MouldDotCheckRuleBillSub> ls = new List<Model.ClsSc_MouldDotCheckRuleBillSub>();
                ls = oListModels.getObjectByJson_Sc_MouldDotCheckRuleBillSub(msg3);
                int i = 0;
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub item in ls)
                {
                    i++;
                    item.HEntryID = i;
                    item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    item.HCloseType = false;   //关闭类型
                    item.HSourceInterID = 0;     // æºå•主内码
                    item.HSourceEntryID = 0;   //源单子内码
                    item.HRelationQty = 0;     //关联数量
                    oBill.DetailCol.Add(item);
                }
                //配件项表体数据
                //按 },{来拆分数组 //去掉【和】
                msg4 = msg4.Substring(1, msg4.Length - 2);
                msg4 = msg4.Replace("\\", "");
                msg4 = msg4.Replace("\n", "");  //\n
                                                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>();
                ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckRuleBillSub_Item(msg4);
                int j = 0;
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub_Item oItemSub in ls1)
                {
                    j++;
                    oItemSub.HEntryID = j;
                    //oItemSub.HCloseMan = "";       //行关闭
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    oItemSub.HSourceInterID = 0;     // æºå•主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    oItemSub.HRelationQty = 0;     //关联数量
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region å™¨å…·ç‚¹æ£€è§„程表编辑时获取表头数据
        [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBillListCheckDetai")]
        [HttpGet]
        public ApiResult<DataSet> Sc_MouldDotCheckRuleBillListCheckDetai(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 a.*,mt.HBillNo MouldFileNo from  Sc_MouldDotCheckRuleBillMain a left join Gy_MouldFileMain mt on a.HMouldID = mt.HInterID    where a.HInterID= " + HID + " ", "Sc_MouldDotCheckRuleBillMain");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在器具点检规程记录" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion
        #region å™¨å…·ç‚¹æ£€è§„程编辑时获取表体数据新(点检项列表、配件项列表)
        [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBillSubAndSubItem")]
        [HttpGet]
        public object Sc_MouldDotCheckRuleBillSubAndSubItem(string HInterID)
        {
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string Swhere = "";
            try
            {
                if (HInterID != "" || HInterID != null)
                {
                    Swhere = " and hmainid='" + HInterID + "'";
                }
                else
                {
                    Swhere = HInterID;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //获取点检项目编辑数据
                string sql = "select ç‚¹æ£€é¡¹ç›®ID HDotCheckItemID,点检项目代码 HDotCheckItemNumber,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,负责人ID HManagerID,负责人代码 HManagerNumber,负责人名称 HManagerName,子备注2 HRemark from h_v_Sc_MouldDotCheckRuleBillSub where 1 = 1 " + Swhere + "";
                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillSub");
                //获取配件项目编辑数据
                string sql1 = "select é…ä»¶ID HMaterID,配件代码 HMaterNumber,配件名称 HMaterName,单位ID HUnitID,计量单位代码 HUnitNumber,计量单位名称 HUnitName,用量 HQty,子备注1 HRemark,标准用量 HQtyMust from h_v_Sc_MouldDotCheckRuleBillSub_Item where 1 = 1 " + Swhere + "";
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldDotCheckRuleBillSub_Item");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.list = list;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region å™¨å…·ç‚¹æ£€è§„程记录删除功能
        [Route("Sc_MouldDotCheckRuleBill/DeleteMouldDotCheckRuleBill")]
        [HttpGet]
        public object DeleteMouldDotCheckRuleBill(string HInterID, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            DAL.ClsSc_MouldDotCheckRuleBill oBill = new DAL.ClsSc_MouldDotCheckRuleBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                if (oBill.omodel.HBillStatus > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据当前处于不能删除状态!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "0";
                    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;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据未找到";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -68,23 +68,13 @@
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -3506,6 +3506,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();
            string UserName = "";
@@ -3520,7 +3521,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DBUtility.ClsPub.CurUserName = msg4;
                DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
                List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -3530,8 +3531,8 @@
                {
                    //oItem.HMaker = "";
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3821";
                    oItem.HBillSubType = "3821";
                    oItem.HBillType = "3820";
                    oItem.HBillSubType = "3820";
                    //oItem.HInterID =0;
                    //oItem.HBillNo = "";
@@ -3559,7 +3560,7 @@
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //点检项目表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
@@ -3592,6 +3593,32 @@
                    oBill.DetailColl.Add(oItemSub);
                }
                //配件项表体数据
                //按 },{来拆分数组 //去掉【和】
                msg5 = msg5.Substring(1, msg5.Length - 2);
                msg5 = msg5.Replace("\\", "");
                msg5 = msg5.Replace("\n", "");  //\n
                                                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();
                ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(msg5);
                int j = 0;
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oItemSub in ls1)
                {
                    j++;
                    oItemSub.HEntryID = j;
                    //oItemSub.HCloseMan = "";       //行关闭
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    oItemSub.HSourceInterID = 0;     // æºå•主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    oItemSub.HRelationQty = 0;     //关联数量
                    oBill.DetailCol.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
@@ -3653,28 +3680,27 @@
        [HttpGet]
        public object Sc_MouldDotCheckPlanBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string Swhere = "";
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID", "Sc_MouldDotCheckPlanBillSub");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                }
                else
                {
                    string sql1 = "select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckPlanBillSub");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                }
                //获取点检项目编辑数据
                ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub");
                //获取配件项目编辑数据
                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
                    from Sc_MouldDotCheckPlanBillSub_Item b
                    left join Gy_Material mt on b.HMaterID=mt.HItemID
                    left join h_v_IF_Unit u2 on b.HUnitID=u2.HItemID  where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = null;
                objJsonResult.list = list;
            }
            catch (Exception e)
            {
WebAPI/ListModels.cs
@@ -713,6 +713,42 @@
        }
        /// <summary>
        /// å¤„理新增器具点检规程项目的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillMain> getObjectByJson_Sc_MouldDotCheckRuleBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增器具点检规程 å­è¡¨ç‚¹æ£€é¡¹ç›®çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillSub> getObjectByJson_Sc_MouldDotCheckRuleBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增器具点检规程 å­è¡¨ é…ä»¶çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> getObjectByJson_Sc_MouldDotCheckRuleBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具保养记录表子表配件项的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -848,6 +884,19 @@
        }
        /// <summary>
        /// å¤„理新增模具点检计划表 é…ä»¶å­è¡¨çš„json
        /// ClsSc_MouldDotCheckPlanBillSub
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增职员表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/WebAPI.csproj
@@ -392,6 +392,7 @@
    <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
    <Compile Include="Controllers\Gy_MateMouldController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
    <Compile Include="Controllers\Pay_ReportController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\DataHelper.cs" />
@@ -939,6 +940,7 @@
    <Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
    <Folder Include="Views\Sc_ComplementGoods\" />
    <Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
    <Folder Include="Views\Sc_MouldDotCheckRuleBill\" />
    <Folder Include="Views\Sc_MouldRepairOutBill\" />
    <Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
    <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />