ch
2021-05-18 81bb8ba5bcc184ceb6ef82f53c41812bc71f5ee0
noting
4个文件已修改
4个文件已添加
832 ■■■■■ 已修改文件
WebAPI/Controllers/QC_ManagementController.cs 241 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsWW_EntrustWorkOrderBill.cs 343 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsWW_EntrustWorkOrderBillMain.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsWW_EntrustWorkOrderBillSub.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_ManagementController.cs
New file
@@ -0,0 +1,241 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Service;
using System.Collections.Generic;
using System.Data;
using Newtonsoft.Json.Linq;
namespace WebAPI.Controllers
{
    public class QC_ManagementController : ApiController
    {
        #region 错误返回方法
        // GET: QC_Management
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        ///<summary>
        ///封装状态码及返回信息的公用方法。
        ///参数:DataSet。
        ///返回值:json。
        ///</summary>
        public object GetObjectJson(DataSet ds)
        {
            try
            {
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        ///<summary>
        ///统一正确信息方法。
        ///参数:string。
        ///返回值:object。
        ///</summary>
        public object CustomCorrect(DataSet ds)
        {
            if (ds == null || ds.Tables[0].Rows.Count <= 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
        }
        ///<summary>
        ///自定义错误信息方法。
        ///参数:string。
        ///返回值:object。
        ///</summary>
        public object CustomError(string msg)
        {
            objJsonResult.code = "0";
            objJsonResult.count = 0;
            objJsonResult.Message = msg;
            objJsonResult.data = null;
            return objJsonResult;
        }
        #endregion
        /// <summary>
        /// 返回检验方案单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("QC_Management/MES_QC_CheckProjectList_Json")]
        [HttpGet]
        public object MES_QC_CheckProjectList_Json(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Gy_QCCheckProjectList ", "h_v_Gy_QCCheckProjectList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        /// 返回来料检验单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("QC_Management/MES_QC_POStockInCheckBillList_Json")]
        [HttpGet]
        public object MES_QC_POStockInCheckBillList_Json(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_POStockInCheckBillList ", "h_v_QC_POStockInCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_POStockInCheckBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_QC_POStockInCheckBillList");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        ///返回首件检验单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("QC_Management/MES_QC_FirstPieceCheckBillList_Json")]
        [HttpGet]
        public object MES_QC_FirstPieceCheckBillList_Json(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_FirstPieceCheckBillList ", "h_v_QC_FirstPieceCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_FirstPieceCheckBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillList");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        /// 返回巡检记录单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("QC_Management/MES_QC_PatrolProcCheckBillList_Json")]
        [HttpGet]
        public object MES_QC_PatrolProcCheckBillList_Json(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList ", "h_v_QC_PatrolProcCheckBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
    }
}
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -2177,6 +2177,168 @@
        }
        /// <summary>
        /// 保存委外工单信息
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("SaveWWWorkOrder")]
        [HttpPost]
        public object SaveWWWorkOrder([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 UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                WebAPI.DLL.ClsWW_EntrustWorkOrderBill WorkOrder = new WebAPI.DLL.ClsWW_EntrustWorkOrderBill();
                List<Models.ClsWW_EntrustWorkOrderBillMain> lsmain = new List<Models.ClsWW_EntrustWorkOrderBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");
                lsmain = oListModels.getObjectByJson_WorkOrderMain(msg2);
                foreach (Models.ClsWW_EntrustWorkOrderBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HDate = DateTime.Now;
                    oItem.HMainSourceInterID = oItem.HInterID;
                    oItem.HInterID = 0;
                    WorkOrder.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<WebAPI.Models.Sc_ProcessPlanViewModel> ls = new List<WebAPI.Models.Sc_ProcessPlanViewModel>();
                ls = oListModels.getObjectByJson_SendWorkSub(msg3);
                int i = 0;
                List<Models.ClsWW_EntrustWorkOrderBillSub> lss = new List<Models.ClsWW_EntrustWorkOrderBillSub>();
                foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls)
                {
                    i++;
                    Models.ClsWW_EntrustWorkOrderBillSub WorkOrdersub = new Models.ClsWW_EntrustWorkOrderBillSub();
                    WorkOrdersub.HProcID = oItemSub.hprocid.Value;//--工序ID
                    WorkOrdersub.HSourceInterID = oItemSub.hmainid.Value; //--源单id
                    WorkOrdersub.HSourceEntryID = oItemSub.hsubid.Value; //--源单子ID
                    WorkOrdersub.HSourceBillNo = oItemSub.单据号; //--源单单号
                    WorkOrdersub.HSourceBillType= oItemSub.HBillType; //--源单类型
                    WorkOrdersub.HRelationQty = 0;  //--关联数量
                    WorkOrdersub.HRelationMoney = 0; //--关联金额
                    WorkOrdersub.HOrderBillNo = ""; //--销售订单号
                    WorkOrdersub.HMaterLenModel = ""; //--材质
                    WorkOrdersub.HMaterQty = 0; //--材质数量
                    WorkOrdersub.HMaterID = oItemSub.HMaterID.Value; //--物料
                    WorkOrdersub.HQty = (double)oItemSub.计划数量; //--订单数量
                    WorkOrdersub.HEntrustType = "3739"; //--委外类型
                    WorkOrdersub.HNextProcName = ""; //--下道工序
                    WorkOrdersub.HPrice =0; //加工费
                    WorkOrdersub.HOutQty = 0;  //--关联发出数量
                    WorkOrdersub.HInQty =0; //--关联接收数量
                    WorkOrdersub.HBackSupDate = DateTime.Now; //--实际交货日期
                    WorkOrdersub.HInDate = DateTime.Now; //--交货日期
                    WorkOrdersub.HWorkProcFlow = ""; //--工艺流
                    WorkOrdersub.HLeftMater = ""; //--余料情况
                    if (oItemSub.计划数量 <= 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!第" + i.ToString() + "行数量不大于0无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (Convert.ToInt32(WorkOrdersub.HQty) > Convert.ToInt32(oItemSub.计划数量))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!第" + i.ToString() + "行派工数量不能大于计划单数量!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    WorkOrdersub.HEntryID = i;
                    WorkOrdersub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    WorkOrdersub.HRemark = "";
                    WorkOrdersub.HCloseMan = "";
                    WorkOrdersub.HCloseType = false;
                    WorkOrdersub.HSourceBillType = oItemSub.HBillType;
                    lss.Add(WorkOrdersub);//先把数据存放到委外工单子表集合里
                }
                if (lss.Count > 0)
                {
                    //然后再循环保存到委外工单子表的集合里
                    foreach (Models.ClsWW_EntrustWorkOrderBillSub Itemsendwork in lss)
                    {
                        WorkOrder.DetailColl.Add(Itemsendwork);
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!lss集合小于0";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (WorkOrder.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = WorkOrder.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = WorkOrder.ModifyBill(WorkOrder.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;
            }
        }
    }
}
WebAPI/Controllers/WebAPIController.cs
@@ -1055,6 +1055,37 @@
            }
        }
        /// <summary>
        /// 获取登录页组织列
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetOrganizations")]
        [HttpGet]
        public object GetOrganizations()
        {
            try
            {
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //==========
                oDs = oCn.RunProcReturn("select HItemID ID,Hname Name,HStopflag Stopflag from Xt_ORGANIZATIONS", "Xt_ORGANIZATIONS");
                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "获取成功!";
                objjson.data = oDs.Tables[0];
                return objjson; ;
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败!异常" + e.ToString();
                objjson.data = null;
                return objjson; ;
            }
        }
        #endregion
WebAPI/DLL/ClsWW_EntrustWorkOrderBill.cs
New file
@@ -0,0 +1,343 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
namespace WebAPI.DLL
{
    public class ClsWW_EntrustWorkOrderBill : DBUtility.ClsXt_BaseBill
    {
        public WebAPI.Models.ClsWW_EntrustWorkOrderBillMain omodel = new Models.ClsWW_EntrustWorkOrderBillMain();
        public List<Models.ClsWW_EntrustWorkOrderBillSub> DetailColl = new List<Models.ClsWW_EntrustWorkOrderBillSub>();
        public ClsWW_EntrustWorkOrderBill()
        {
            base.MvarItemKeySub = "WW_EntrustWorkOrderBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "WW_EntrustWorkOrderBillMain";
            base.MvarReportTitle = "委外工单";
            base.BillType = "3739";
            base.HBillSubType = "3739";
        }
        #region 固定代码
        ~ClsWW_EntrustWorkOrderBill()
        {
            DetailColl = null;
        }
        #endregion   自定义方法
        //删除单据
        public override bool DeleteBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                oCn.BeginTran();
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
                //删除明细表
                DeleteBillSub(lngBillKey);
                DeleteBillSub2(lngBillKey);
                DeleteBillSub3(lngBillKey);
                DeleteBillSub4(lngBillKey);
                //删除主表
                DeleteBillMain(lngBillKey);
                sReturn = "删除单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate WW_EntrustWorkOrderBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                    //========================================
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HSupID=" + omodel.HSupID.ToString() +
                ",HOrderProcNO='" + omodel.HOrderProcNO + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Models.ClsWW_EntrustWorkOrderBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into WW_EntrustWorkOrderBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
                      ",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
                      ",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
                      ") 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
                      ",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
                      ",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() +",'" + oSub.HLeftMater + "'" +
                      ") ");
                }
                //根据内码 委外工单表头供应商 回填对应流转卡 供应商,有委外标记才回填
                oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
                //
                //
                DataSet Ds;
                Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
                if (Ds == null)
                {
                    sReturn = "判断数量失败!";
                    oCn.RollBack();
                    return false;
                }
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "判断数量失败!";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                //若MAINDI重复则重新获取
                //if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
                //{
                //    omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                //}
                if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
                {
                    omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into WW_EntrustWorkOrderBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HDeptID,HSupID,HOrderProcNO" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                ", " + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HOrderProcNO + "'" +
                ") ");
                //插入子表
                foreach (Models.ClsWW_EntrustWorkOrderBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into WW_EntrustWorkOrderBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
                      ",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
                      ",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
                      ") 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
                      ",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
                      ",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() + ",'" + oSub.HLeftMater +  "'"  +
                      ") ");
                }
                ////根据内码 委外工单表头供应商 回填对应流转卡 供应商,有委外标记才回填..并且回填 关联数量
                //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
                ////
                //DataSet Ds;
                //Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
                //if (Ds == null)
                //{
                //    sReturn = "判断数量失败!";
                //    oCn.RollBack();
                //    return false;
                //}
                //if (Ds.Tables[0].Rows.Count == 0)
                //{
                //    sReturn = "判断数量失败!";
                //    oCn.RollBack();
                //    return false;
                //}
                //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
                //{
                //    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
                //    oCn.RollBack();
                //    return false;
                //}
                //
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn("Select * from WW_EntrustWorkOrderBillMain Where HInterID=" + lngBillKey.ToString(), "WW_EntrustWorkOrderBillMain");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到!";
                    return false;
                }
                //固定赋值===========================================
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================
                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
                omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
                omodel.HOrderProcNO = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HOrderProcNO"]);
                //
                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from WW_EntrustWorkOrderBillSub Where HInterID=" + lngBillKey.ToString(), "WW_EntrustWorkOrderBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Models.ClsWW_EntrustWorkOrderBillSub oSub = new Models.ClsWW_EntrustWorkOrderBillSub();
                    // 固定赋值===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
                    oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
                    //===================================================
                    oSub.HOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOrderBillNo"]);
                    oSub.HLeftMater = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLeftMater"]);
                    oSub.HMaterLenModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaterLenModel"]);
                    oSub.HMaterQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMaterQty"]);
                    oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
                    oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]);
                    oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
                    oSub.HEntrustType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HEntrustType"]);
                    oSub.HNextProcName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNextProcName"]);
                    oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
                    oSub.HOutQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOutQty"]);
                    oSub.HInQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HInQty"]);
                    oSub.HInDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HInDate"]);
                    oSub.HBackSupDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HBackSupDate"]);
                    oSub.HWorkProcFlow = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWorkProcFlow"]);
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功!";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
        //更新打印次数
        public bool Set_PrintQty(long sInterID)
        {
            try
            {
                oCn.BeginTran();
                //更新 打印次数
                oCn.RunProc("update WW_EntrustWorkOrderBillMain set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + sInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }
    }
}
WebAPI/ListModels.cs
@@ -321,5 +321,17 @@
            return list;
        }
        /// <summary>
        /// 委外工单主表json处理
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsWW_EntrustWorkOrderBillMain> getObjectByJson_WorkOrderMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsWW_EntrustWorkOrderBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsWW_EntrustWorkOrderBillMain>>(jsonString);
            return list;
        }
    }
}
WebAPI/Models/ClsWW_EntrustWorkOrderBillMain.cs
New file
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WebAPI.Models
{
    public class ClsWW_EntrustWorkOrderBillMain:DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HDeptID;//        int    //申请部门(h_v_CLD_Department)
        public Int64 HSupID;//        int    //外协供应商(h_v_CLD_Supplier)
        public string HOrderProcNO;//    varchar(100)    //订单跟踪号
    }
}
WebAPI/Models/ClsWW_EntrustWorkOrderBillSub.cs
New file
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WebAPI.Models
{
    public class ClsWW_EntrustWorkOrderBillSub:DBUtility.ClsXt_BaseBillSub
    {
        public string HOrderBillNo;//    varchar(100)    //订单号
        public string HMaterLenModel;//    varchar(200)    //板材料件尺寸
        public double HMaterQty;//    dec(18,8)        //板材张数
        public Int64 HMaterID;//        int        //加工产品(h_v_CLD_Material)
        public double HQty;//        dec(18,8)        //生产数量
        public string HEntrustType;//    varchar(200)    //委外加工类型
        public string HNextProcName;//    varchar(200)     //委外下道工序
        public double HPrice;//        dec(18,8)        //加工单价
        public double HOutQty;//        dec(18,8)        //转出数量
        public double HInQty;//        dec(18,8)        //接收数量
        public DateTime HInDate;//        datetime        //回厂时间
        public string HRemark;//        varchar(500)    //备注
        public string HWorkProcFlow;//    varchar(500)    //产品工艺
        public Int64 HProcID;
        public DateTime HBackSupDate;
        public string HLeftMater;           //余料
    }
}
WebAPI/WebAPI.csproj.user
@@ -17,8 +17,8 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>