Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yxj

2023-05-25 9f6816fd0824aafc360bee29c9ec1eb76fa0aa16

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 Model/²É¹º¹ÜÀí/ClsCg_POInStockBillSub.cs

@@ -78,5 +78,7 @@
        public Int64 HSELLERWITHHOLDING;
        public Int64 HBUYERWITHHOLDING;

        public string HSalOutStockBillNo; //销售出库单编码_序号
        public Int64 HSalOutStockEntryId; //销售出库单分录Id
    }
}

 Pub_Class/CustomerCls/ClsPub.cs

@@ -2503,5 +2503,97 @@
            }
            return sb.ToString();
        }

        //拼接sql，按车间，工作中心查询
        public static string SpliceSQL(string czymc,string ListName)
        {
            DataSet ds;
            ClsSqlHelper oCN = new ClsSqlHelper();
            string sql = "";

            //判断是否有查询列表所有信息权限
            if (!Security_Log("Xt_List_All", 1, false, czymc))
            {
                //无
                switch (ListName)
                {
                    case "工艺路线列表":
                        sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
                        break;
                    case "生产订单列表":
                        sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
                        break;
                    case "工序派工单列表":
                        sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
                        break;
                    case "工序派工单明细列表":
                        sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
                        break;
                    case "工序汇报单列表":
                        sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
                        break;
                    case "生产车间工序报表":
                        sql = ",'" + czymc +"'";
                        break;
                    case "工序在制品报表":
                        sql = ",'" + czymc + "'";
                        break;
                    case "工序汇报日报表":
                        sql = ",'" + czymc + "'";
                        break;
                    case "计件工资报表":
                        sql = ",'" + czymc + "'";
                        break;
                    case "计件工资汇总报表":
                        sql = ",'" + czymc + "'";
                        break;
                }
                return sql;
            }
            else
            {
                //有
                return sql;
            }

            //ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + czymc + "'", "gy_czygl");
            ////判断是否查询到相关用户信息
            //if (ds != null || ds.Tables[0].Rows.Count != 0)
            //{
            //    Int64 HManagerFlag = Convert.ToInt64(ds.Tables[0].Rows[0]["ManagerFlag"]);
            //    if (HManagerFlag == 1)//有管理员权限
            //    {
            //        return sql;
            //    }
            //    else //没有管理员权限
            //    {
            //        switch (ListName)
            //        {
            //            case "工艺路线列表":
            //                sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
            //                break;
            //            case "生产订单列表":
            //                sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
            //                break;
            //            case "工序派工单列表":
            //                sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
            //                break;
            //            case "工序派工单明细列表":
            //                sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
            //                break;
            //            case "工序汇报单列表":
            //                sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
            //                break;
            //        }                   
            //        return sql;
            //    }
            //}
            //else
            //{
            //    sql = "没有查询到相关用户信息";
            //    return sql;
            //}
        }

    }
}

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -724,6 +724,88 @@
        }
        #endregion

        #region  æ ¹æ®ç”¨æˆ·ç¼–码查找已分配工作中心列表
        [Route("Xt_User/UserWorkCenterlistPlaylist")]
        [HttpGet]
        public object UserWorkCenterlistPlaylist(string HUserID)
        {
            try
            {

                ds = oCN.RunProcReturn("select HWorkCenterID HItemID,工作中心代码 HNumber,工作中心名称 HName from h_v_Gy_UserWorkCenterRelationList where HUserID='" + HUserID + "' ", "h_v_Gy_UserWorkCenterRelationList");
                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 = "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 ç”¨æˆ·å…³è”工作中心保存
        [Route("Xt_User/SaveUserWorkCenter")]
        [HttpPost]
        public object SaveUserWorkCenter([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();

            ListModels oListModels = new ListModels();
            try
            {
                List<Models.WorkCenter> lsmain = new List<Models.WorkCenter>();
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_WorkCenter(msg2);
                oCN.BeginTran();
                //删除已经关联的数据
                oCN.RunProc("Delete From Gy_UserWorkCenterRelation  where HUserID='" + msg3.ToString() + "'");
                foreach (Models.WorkCenter oItem in lsmain)
                {
                    //重新写入关联数据
                    oCN.RunProc("insert into Gy_UserWorkCenterRelation (HWorkCenterID,HUserID) values ('" + oItem.HItemID + "','" + msg3.ToString() + "')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                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("Xt_User/UserByWorkStationlistPlaylist")]
        [HttpGet]

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -595,12 +595,12 @@
,HPRICECOEFFICIENT,HPRICEUNITID,HPRICELISTENTRY,HSAMPLEDAMAGEQTY,HSAMPLEDAMAGEBASEQTY
,HPAYORGID,HSETTLEORGID,HSETTLECURRID,HSETTLEMODEID,HEXCHANGETYPEID,HPAYCONDITONID
,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX
,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HSecUnitID) 
,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HSecUnitID,HSalOutStockBillNo,HSalOutStockEntryId) 
values(
'{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}'
,'{oSub.HMoney}','{oSub.HWHID}','{oSub.HSPID}','{oSub.HRemark}','{oSub.HTaxMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney_TAX}','{oSub.HTaxRate_TAX}'
,'{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HPOOrderInterID}','{oSub.HPOOrderEntryID}','{oSub.HPOOrderBillNo}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HPlanMode}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HRelationQty}','{oSub.HGiveAwayFlag}','{oSub.HReceiveQty}','{oSub.HSEQ}','{oSub.HPRODUCEDATE}','{oSub.HEXPIRYDATE}',
'{oSub.HSUPPLYLOT}','{oSub.HREQTRACENO}','{oSub.HBOMID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HSTOCKSTATUSID}','{oSub.HKEEPERTYPEID}','{oSub.HPROJECTNO}','{oSub.HCHECKINCOMING}','{oSub.HTaxPrice}','{oSub.HDISCOUNTRATE}','{oSub.HPRICECOEFFICIENT}','{oSub.HPRICEUNITID}','{oSub.HPRICELISTENTRY}','{oSub.HSAMPLEDAMAGEQTY}','{oSub.HSAMPLEDAMAGEBASEQTY}','{oSub.HPAYORGID}','{oSub.HSETTLEORGID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HEXCHANGETYPEID}','{oSub.HPAYCONDITONID}','{oSub.HEXCHANGERATE}','{oSub.HLOCALCURRID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HCOSTAMOUNT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HSecUnitID}')";
'{oSub.HSUPPLYLOT}','{oSub.HREQTRACENO}','{oSub.HBOMID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HSTOCKSTATUSID}','{oSub.HKEEPERTYPEID}','{oSub.HPROJECTNO}','{oSub.HCHECKINCOMING}','{oSub.HTaxPrice}','{oSub.HDISCOUNTRATE}','{oSub.HPRICECOEFFICIENT}','{oSub.HPRICEUNITID}','{oSub.HPRICELISTENTRY}','{oSub.HSAMPLEDAMAGEQTY}','{oSub.HSAMPLEDAMAGEBASEQTY}','{oSub.HPAYORGID}','{oSub.HSETTLEORGID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HEXCHANGETYPEID}','{oSub.HPAYCONDITONID}','{oSub.HEXCHANGERATE}','{oSub.HLOCALCURRID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HCOSTAMOUNT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HSecUnitID}','{oSub.HSalOutStockBillNo}','{oSub.HSalOutStockEntryId}')";
                    oCN.RunProc(sql);
                }
                oCN.Commit();

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -478,6 +478,264 @@
            }
        }

        #region æ‰¹é‡æ–°å¢žå•æ®-保存按钮
        [Route("Cj_StationOutBill/BatchAddBill")]
        [HttpPost]
        public object BatchAddBill([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            try
            {
                //反序列化
                string msg2 = "[" + sArray[0].ToString() + "]"; //表头
                string user = sArray[1].ToString();//用户名
                string msg3 = sArray[2].ToString(); //表体
                Int64 OperationType = Convert.ToInt64(sArray[3]); //操作类型

                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无编辑权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
                List<StationBill> listSub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg3);

                oCN.BeginTran();
                for (int i = 0;i < listSub.Count; i++)
                {
                    long HMainInterID = 0;
                    HMainInterID = list[0].HMainInterID;
                    string eventType = list[0].eventType;
                    string BillType = "3791";
                    string HBillSubType = "3791";
                    long HInterID = listSub[i].HInterID;//递入type得到的单据ID
                    string HBillNo = listSub[i].HBillNo;//递入type得到的单据号
                    int HBillStatus = 0;
                    string HMaker = user;//制单人
                    string HMouldNum = list[0].HMouldNum;//模穴号
                    int HYear = DateTime.Now.Year;
                    double HPeriod = DateTime.Now.Month;
                    string HRemark = list[0].HRemark;//备注
                    string HSourceName = listSub[i].HSourceName;//生产资源名称
                    double HPieceQty = list[0].HPieceQty;//进站PCS数
                    double HWasterQty = listSub[i].HWasterQty;//报废数量
                    double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
                    double HBadPNL = list[0].HBadPNL;//报废PNL数
                    long HICMOInterID = listSub[i].HICMOInterID;//任务单ID
                    string HICMOBillNo = listSub[i].HICMOBillNo;//任务单
                    int HProcPlanInterID = 0;
                    int HProcPlanEntryID = 0;
                    string HProcPlanBillNo = "";
                    long HProcExchInterID = listSub[i].lngBillKey;
                    long HProcExchEntryID = listSub[i].lngBillSubKey;
                    string HProcExchBillNo = listSub[i].HProcExchBillNo;//流转卡
                    long HMaterID = listSub[i].HMaterID;//产品ID
                    long HProcID = listSub[i].HProcID;//当前工序ID
                    double HICMOQty = listSub[i].HICMOQty;//任务单数量
                    double HPlanQty = list[0].HPlanQty;//移交PNL数
                    DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
                    long HSourceID = listSub[i].HSourceID;//生产资源ID
                    long HPayProcID = list[0].HPayProcID;//核算工序ID
                    long HGroupID = list[0].HGroupID;//班组ID
                    long HDeptID = 0;
                    long HEmpID = listSub[i].HEmpID;//操作员ID
                    string HBarCode = list[0].HBarCode;//条形码
                    string HAddr = "";
                    string HBarCodeMaker = "";
                    long HSourceID2 = list[0].HSourceID2;//生产资源2ID
                    long HSourceID3 = list[0].HSourceID3;//生产资源3ID
                    long HSourceID4 = list[0].HSourceID4;//生产资源4ID
                    long HSourceID5 = list[0].HSourceID5;//生产资源5ID
                    long HSupID = 0;
                    double HQty = listSub[i].HQty;//合格数量
                    double HPrice = 0;
                    double HMoney = 0;
                    double HBadCount = list[0].HBadCount;//不良数量
                    long HCenterID = listSub[0].HCenterID;//工作中心ID
                    string HProcNo = listSub[i].HProcNo;//流水号
                    string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                    string HSourceNameList = list[0].HSourceNameList;//设备清单
                    long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
                    string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
                    string HMainSourceBillType = "3790";
                    bool HLastSubProc = list[0].HLastSubProc;//转下工序
                    long HEmpID2 = list[0].HEmpID2;//操作员2ID
                    long HEmpID3 = list[0].HEmpID3;//操作员3ID
                    long HEmpID4 = list[0].HEmpID4;//操作员4ID
                    long HEmpID5 = list[0].HEmpID5;//操作员5ID
                    double HDSQty = list[0].HDSQty;//折弯刀数
                    double HChongQty = list[0].HChongQty;//NCT冲次数
                    double HPriceRate = list[0].HPriceRate;//系数
                    double HWorkTimes = list[0].HWorkTimes;//工时
                    long HQCCheckID = list[0].HQCCheckID;//检验员ID
                    long HPRDOrgID = list[0].HPRDOrgID;//组织ID

                    var num = 0;

                    //若MAINDI重复则重新获取                   
                    if (OperationType == 1)//新增
                    {
                        num = 1;
                        if (!AllowbillNo(HBillNo))
                        {
                            oCN.RollBack();
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        oCN.RunProc("Insert Into Sc_StationOutBillMain " +
                        "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
                        ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
                        ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                        ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
                        ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
                        ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                        ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
                        ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
                        ") " +
                        " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                        "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
                        "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
                        ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
                        "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
                        "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
                        "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                        "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                        ") ");
                    }
                    else
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "操作类型无效！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //主表

                    ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
                    if (ds == null)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "判断数量失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "判断数量失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "数量控制," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + "," + num + "");
                    oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus  " + HInterID + " ");
                    oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode  " + HInterID + " ");
                    //判断是否是 æœ«é“工序 
                    ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +
                                        " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID  " +
                                        " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
                    //判断是否是新增
                    if (OperationType == 1)
                    {
                        //判断是否是末道工序
                        if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "是")
                        {
                            //获取系统参数
                            string Return = "";
                            if (oSystemParameter.ShowBill(ref Return))
                            {
                                //判断末道 ç”Ÿäº§æ±‡æŠ¥æ±‡æŠ¥ æ˜¯å¦å‹¾é€‰
                                if (oSystemParameter.omodel.MES_StationOutBill_LastAutoICMOReport == "Y") //系统参数   
                                {
                                    //同步生产汇报单
                                    objJsonResult = (json)SaveICMOReportBill(HInterID.ToString(), user, HBillNo, HPRDOrgID.ToString());
                                    if (objJsonResult.count == 0)
                                    {
                                        oCN.RollBack();
                                        objJsonResult.code = "0";
                                        objJsonResult.count = 0;
                                        objJsonResult.Message = objJsonResult.Message;
                                        objJsonResult.data = null;
                                        return objJsonResult;
                                    }
                                }
                                //判断末道 ç”Ÿäº§å…¥åº“ æ˜¯å¦å‹¾é€‰
                                else if (oSystemParameter.omodel.MES_StationOutBill_AutoStockIn == "Y") //系统参数   
                                {
                                    //同步生产入库单
                                    objJsonResult = (json)SaveProcdutInBill(HBillNo);
                                    if (objJsonResult.count == 0)
                                    {
                                        oCN.RollBack();
                                        objJsonResult.code = "0";
                                        objJsonResult.count = 0;
                                        objJsonResult.Message = objJsonResult.Message;
                                        objJsonResult.data = null;
                                        return objJsonResult;
                                    }
                                }

                            }
                        }
                    }
                }
                
                oCN.Commit();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.MES_StationOutBill_SaveAutoAddnew == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
                    {
                        objJsonResult.Verify = "Y";
                    }
                    else
                    {
                        objJsonResult.Verify = "N";
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æœ«é“工序 ç”Ÿäº§æ±‡æŠ¥
        public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
        {
@@ -1214,9 +1472,34 @@
                    return objJsonResult;
                }

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序汇报单列表");

                        if (sql_splice == "没有查询到相关用户信息")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "没有查询到相关用户信息!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            sWhere += sql_splice;
                        }
                    }
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList  order by hmainid desc", "h_v_MES_StationOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList where 1 = 1" + sWhere + "order by hmainid desc", "h_v_MES_StationOutBillList");
                }
                else
                {

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -18,6 +18,7 @@
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region è½¦é—´å·¥åºå…¨ç¨‹è·Ÿè¸ªæŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
@@ -172,10 +173,37 @@
        #region è®¡ä»¶å·¥èµ„报表 æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/EmployeePiecePayReport")]
        [HttpGet]
        public object EmployeePiecePayReport(string sWhere)
        public object EmployeePiecePayReport(string sWhere, string user)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "计件工资报表");

                        if (sql_splice != "")
                        {
                            sWhere += sql_splice;
                        }
                        else
                        {
                            string czymc = "";
                            ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + user + "'", "gy_czygl");
                            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                            {
                                czymc += Convert.ToString(ds.Tables[0].Rows[i]["czymc"]) + ",";
                            }
                            sWhere += ",''";
                        }
                    }
                }

                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_EmployeePiecePayReport " + sWhere + "", "h_p_Sc_EmployeePiecePayReport");
@@ -210,10 +238,37 @@
        #region è®¡ä»¶å·¥èµ„汇总报表 æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/EmployeePiecePaySumReport")]
        [HttpGet]
        public object EmployeePiecePaySumReport(string sWhere)
        public object EmployeePiecePaySumReport(string sWhere, string user)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "计件工资汇总报表");

                        if (sql_splice != "")
                        {
                            sWhere += sql_splice;
                        }
                        else
                        {
                            string czymc = "";
                            ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + user + "'", "gy_czygl");
                            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                            {
                                czymc += Convert.ToString(ds.Tables[0].Rows[i]["czymc"]) + ",";
                            }
                            sWhere += ",''";
                        }
                    }
                }

                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_EmployeePiecePaySumReport " + sWhere + "", "h_p_Sc_EmployeePiecePaySumReport");
@@ -248,10 +303,37 @@
        #region å·¥èµ„汇报日报表 æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/EmployeePieceWorkReport")]
        [HttpGet]
        public object EmployeePieceWorkReport(string sWhere)
        public object EmployeePieceWorkReport(string sWhere, string user)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序汇报日报表");

                        if (sql_splice != "")
                        {
                            sWhere += sql_splice;
                        }
                        else
                        {
                            string czymc = "";
                            ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + user + "'", "gy_czygl");
                            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                            {
                                czymc += Convert.ToString(ds.Tables[0].Rows[i]["czymc"]) + ",";
                            }
                            sWhere += ",''";
                        }
                    }
                }

                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_EmployeePieceWorkReport " + sWhere + "", "h_p_Sc_EmployeePieceWorkReport");
@@ -286,10 +368,37 @@
        #region ç”Ÿäº§è½¦é—´å·¥åºæŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/WorkShopProcessWIPReport")]
        [HttpGet]
        public object WorkShopProcessWIPReport(string sWhere)
        public object WorkShopProcessWIPReport(string sWhere,string user)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "生产车间工序报表");

                        if(sql_splice != "")
                        {
                            sWhere += sql_splice;
                        }
                        else
                        {
                            string czymc = "";
                            ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + user + "'", "gy_czygl");
                            for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
                            {
                                czymc += Convert.ToString(ds.Tables[0].Rows[i]["czymc"])+",";
                            }
                            sWhere += ",''";
                        }                        
                    }
                }

                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_WorkShopProcessWIPReport " + sWhere + "", "h_p_Sc_WorkShopProcessWIPReport");
@@ -324,10 +433,37 @@
        #region å·¥åºåœ¨åˆ¶å“æŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/WorkShopProcessWIPSumReport")]
        [HttpGet]
        public object WorkShopProcessWIPSumReport(string sWhere)
        public object WorkShopProcessWIPSumReport(string sWhere, string user)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序在制品报表");

                        if (sql_splice != "")
                        {
                            sWhere += sql_splice;
                        }
                        else
                        {
                            string czymc = "";
                            ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + user + "'", "gy_czygl");
                            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                            {
                                czymc += Convert.ToString(ds.Tables[0].Rows[i]["czymc"]) + ",";
                            }
                            sWhere += ",''";
                        }
                    }
                }

                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_WorkShopProcessWIPSumReport " + sWhere + "", "h_p_Sc_WorkShopProcessWIPSumReport");

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -33,6 +33,9 @@
        public string BillType = "3301";
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        string user_LongShan = "";
        string HName_LongShan = "";

        #region æœªçŸ¥
        /// <summary>
        /// æœªçŸ¥
@@ -126,6 +129,7 @@
            int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改 2 å¤åˆ¶
            string user = sArray[3].ToString();//用户名
            string HComputerName = SystemInformation.ComputerName; //设备名称
            user_LongShan = sArray[3].ToString();//用户名
            try
            {
                //判断是否有编辑权限
@@ -173,8 +177,9 @@
                string HMaterTexture = mainList[0].HMaterTexture;//材质
                string HProductNum = mainList[0].HProductNum;//成品编号
                string HVerNum = mainList[0].HVerNum;//版本
                int IsProNo = mainList[0].IsProNo;//是否转工序
              
                int IsProNo = mainList[0].IsProNo;//是否转工序                     
                HName_LongShan = mainList[0].HName;//工艺路线名称

                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where  å•æ®å·='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
@@ -333,6 +338,8 @@
        {
            List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
            int i = 0;
            string Ret = "";
            oSystemParameter.ShowBill(ref Ret);
            foreach (Gy_RoutingBillSub oSub in DetailColl)
            {
                i++;
@@ -344,32 +351,71 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                
                //如果工价为0，则工价字段不做为必填字段
                if (oSub.HProcPrice == 0 && oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                {
                    oCN.RunProc("Insert into Gy_RoutingBillSub " +
                    "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
                    ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
                    ",HReadyTime,HQueueTime,HMoveTime" +
                    ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
                    ",HFixPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
                    ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
                    ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
                    ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
                    ") values("
                    + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                    "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
                    "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
                    ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
                    "," + oSub.HFixPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
                    "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
                   "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
                   "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
                   ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
                   ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                   "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() +
                    ") ");
                }
                else
                {
                    oCN.RunProc("Insert into Gy_RoutingBillSub " +
                    "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
                    ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
                    ",HReadyTime,HQueueTime,HMoveTime" +
                    ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
                    ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
                    ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
                    ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
                    ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
                    ") values("
                    + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                    "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
                    "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
                    ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
                    "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
                    "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
                   "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
                   "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
                   ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
                   ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                   "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() +
                    ") ");

                oCN.RunProc("Insert into Gy_RoutingBillSub " +
                "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
                ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
                ",HReadyTime,HQueueTime,HMoveTime" +
                ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
                ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
                ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
                ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
                ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID " +
                ") values("
                + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
                "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
                ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
                "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
                "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
               "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
               "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
               ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
               ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
               "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() +
                ") ");
                    if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                    {
                        string HComputerName = SystemInformation.ComputerName; //设备名称

                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user_LongShan + "','" + HComputerName + "','" + "Gy_RoutingBill_Edit,工艺路线_编辑" + "','LMES系统-工艺路线编辑模块','" + DBUtility.ClsPub.IPAddress + "','" + "修改了工艺路线：" + HName_LongShan + " å·¥åºå·ï¼š" + oSub.HProcNo + " å·¥ä»·ä¸ºï¼š" + oSub.HProcPrice.ToString() + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                }                
            }

            objJsonResult.code = "1";

 WebAPI/Controllers/LMESController.cs

@@ -17,6 +17,7 @@

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        /// <summary>
        /// è¿”回进站扫描列表|工序进站接收单列表 
        ///参数：string sql。
@@ -70,6 +71,20 @@
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序派工单列表");

                        sWhere += sql_splice;                       
                    }
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -153,6 +168,21 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序派工单明细列表");

                        sWhere += sql_splice;                        
                    }
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
                objJsonResult.code = "1";
@@ -374,10 +404,24 @@
                    return objJsonResult;
                }

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user,"工艺路线列表");

                        sWhere += sql_splice;                        
                    }
                }               

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 1 = 1" + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
                }
                else
                {
@@ -397,6 +441,100 @@
            return GetObjectJson(ds);
        }

        #endregion       

        #region æŸ¥çœ‹å·¥è‰ºè·¯çº¿åˆ—表工价权限
        /// <summary>
        /// åˆ¤æ–­æœ‰æ— æŸ¥çœ‹å·¥ä»·æƒé™
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/CheckProcPrice")]
        [HttpGet]
        public object CheckProcPrice(string UserName)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //判断是否有查询工价权限
                        if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "无查看工价权限!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "查看成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult; ;
            }
        }
        #endregion

        #region ä¿®æ”¹å·¥è‰ºè·¯çº¿å·¥ä»·æƒé™
        /// <summary>
        /// åˆ¤æ–­æœ‰æ— ä¿®æ”¹å·¥ä»·æƒé™
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/EditProcPrice")]
        [HttpGet]
        public object EditProcPrice(string UserName)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //判断是否有查询工价权限
                        if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_EditProcPrice", 1, false, UserName))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "无修改工价权限!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult; ;
            }
        }
        #endregion

        #region å·¥è‰ºè·¯çº¿  åˆ é™¤
@@ -630,6 +768,20 @@
                    return objJsonResult;
                }

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //获取需要拼接的字符串
                        string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "生产订单列表");

                        sWhere += sql_splice;
                    }
                }

                ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by åˆ¶å•æ—¥æœŸ desc,单据号 desc", "h_v_IF_ICMOBillList");
            }
            catch (Exception e)

 WebAPI/Controllers/Open_PrintTemController.cs

@@ -138,5 +138,89 @@

        }
        #endregion

        #region [设置默认打印模板]
        /// <summary>
        /// è®¾ç½®é»˜è®¤å°æ¨¡æ¿
        /// </summary>
        /// <returns></returns>
        [Route("Open_PrintTem/DefaultOpenTmp")]
        [HttpGet]
        public object DefaultOpenTmp(string HNumber,string HName)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            try
            {
                oCn.BeginTran();
                //先把此模块下的模板默认模板标记都关闭
                oCn.RunProc("update SRM_OpenTmp set HStdFlag = 0 where HNumber='" + HNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                //更新当前模板为默认模板
                oCn.RunProc("update SRM_OpenTmp set HStdFlag = 1 where HNumber='" + HNumber + "' and HName='"+ HName + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "设置成功!";
                objjson.data = null;
                return objjson;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "设置失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }

        }
        #endregion

        #region [获取默认打印模板]
        /// <summary>
        /// èŽ·å–打印模板列表
        /// </summary>
        /// <returns></returns>
        [Route("Open_PrintTem/GetDefaultOpenTmp_Json")]
        [HttpGet]
        public object GetDefaultOpenTmp_Json(string HNumber)
        {
            sWhere = " Where é»˜è®¤æ ‡è®°=1 ";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (HNumber != "")
            {
                sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
            }
            try
            {
                ds = webserver.GetOpenTmpList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                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 = "0";
                    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;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/POStockInBillController.cs

@@ -936,7 +936,7 @@
                    {
                '@'
                    });
                    string str = array[0];
                    string str = array[0]; //物料代码
                    long num = (long)ClsPub.isInt(array[4]);
                    string text2 = array[6];
                    DateTime dateTime = ClsPub.isDate(array[3]);
@@ -1079,12 +1079,12 @@
                    bool flag6 = text7.Contains("W") || text7.Contains("N");
                    if (flag6)
                    {
                        string text8 = sBarCodeNew.Substring(0, 10);//商品码
                        string text8 = sBarCodeNew.Substring(0, 10);//商品码    å•†å“ç +物料代码+生产日期+批次+失效日期+一位字母+三位数字
                        string str4 = sBarCodeNew.Substring(10, 10);//物料代码
                        string text9 = "20" + sBarCodeNew.Substring(20, 6);
                        long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));
                        long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));
                        long num10 = (long)ClsPub.isInt(text9.Substring(6, 2));
                        long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));  //å¹´
                        long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));  //月
                        long num10 = (long)ClsPub.isInt(text9.Substring(6, 2)); //日
                        long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));//后三位永远都是数字
                        string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);//失效日期+一位字母+三位数字
                        string text11 = "20" + text10.Substring(0, 6);
@@ -1241,7 +1241,7 @@
                    }
                    else
                    {
                        /*前十位物料代码，后六位生效日期，倒数前三位是数字前六位是失效日期  æ‰¹å·æ”¹ä¸ºåŠ¨æ€èŽ·å–*/
                        /*前十位物料代码，后六位生效日期，倒数前三位是数字前六位是失效日期 */
                        string str6 = sBarCodeNew.Substring(0, 10);//物料代码
                        string text17 = "20" + sBarCodeNew.Substring(10, 6);
                        long num21 = (long)ClsPub.isInt(text17.Substring(0, 4));
@@ -1261,7 +1261,7 @@
                    "-",
                    num27.ToString()
                        }));
                        string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100230309 2303704250308010
                        string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100 230309 2303704 250308 010
                        string text21 = text20.Remove(text20.Length - 9 , 9); //SAE1300100230309 2303704 250308010
                         ClsCN clsCN3 = new ClsCN();
                        DataSet dataSet13 = clsCN3.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str6 + "' and  huseorgid = " + HOrgID.ToString(), "Gy_Material");

 WebAPI/Controllers/WebAPIController.cs

@@ -26,6 +26,7 @@
        private json objjson = new json();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
        //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
        /// <summary>
@@ -201,7 +202,7 @@
        public object GetUser(string UserName, string PassWord, string HOrgName)
        {
            try
            {
            {                              
                DataSet ds = null;
                ClsCN oCnLoc = new ClsCN();
                DAL.ClsUser oUser = new DAL.ClsUser();
@@ -244,6 +245,49 @@
            }
        }
        /// <summary>
        /// èœå•æ 
        /// </summary>
        /// <returns></returns>
        [Route("Web/MenuBar")]
        [HttpGet]
        public object MenuBar(string UserName)
        {
            try
            {
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //判断是否有查询权限
                        if (!DBUtility.ClsPub.Security_Log("Xt_MenuBar_Unfold", 1, false, UserName))
                        {
                            objjson.code = "0";
                            objjson.count = 0;
                            objjson.Message = "无展开菜单栏权限!";
                            objjson.data = null;
                            return objjson;
                        }
                    }
                }                
                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "展开成功！";
                objjson.data = 1;
                return objjson;
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "异常！" + e.Message;
                objjson.data = null;
                return objjson; ;
            }
        }
        /// <summary>
        /// ä¿®æ”¹å¯†ç 
        /// </summary>
        /// <param name="UserName"></param>

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -177,27 +177,27 @@
                    case "生产订单":
                        tabname = "h_v_IFCLD_ICMOBillList_Source"; 
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案' order by å•æ®å·", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案')   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案')   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "生产汇报单":
                        tabname = "h_v_IF_ICMOReportBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "采购订单":
                        tabname = "h_v_IF_POOrderBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "收料通知单":
                        tabname = "h_v_IF_POInStockBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "委外订单":
                        tabname = "h_v_IF_EntrustOrderBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "生产入库单":
                        tabname = "h_v_IF_ProductInBillList_Source";

 WebAPI/ListModels.cs

@@ -2374,6 +2374,18 @@
        }

        /// <summary>
        /// ç”¨æˆ·å·¥ä½œä¸­å¿ƒå…³ç³»ä¿¡æ¯è¡¨çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.WorkCenter> getObjectByJson_WorkCenter(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.WorkCenter>>(jsonString);
            return list;
        }

        /// <summary>
        /// ç”¨æˆ·èŒå‘˜å…³ç³»ä¿¡æ¯è¡¨çš„json
        /// </summary>
        /// <param name="jsonString"></param>

 WebAPI/Models/WorkCenter.cs

New file
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class WorkCenter
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }
        public string HName { get; set; }
        public string HShortNumber { get; set; }
        public string HRemark { get; set; }
        public string HUseFlag { get; set; }
        public long HParentID { get; set; }
        public string HBarCode { get; set; }
        public long HSecManagerID { get; set; }
        public long HCreateOrgID { get; set; }
        public long HUseOrgID { get; set; }
        public string HHelpCode { get; set; }
        public string HCreator { get; set; }
        public bool HStopflag { get; set; }
        public Int64 HEmpID { get; set; }
        public string HEmpName { get; set; }
        public string HUpDater { get; set; }
        public string HChecker { get; set; }
        public string HDeleteMan { get; set; }
    }
}

 WebAPI/WebAPI.csproj

@@ -660,6 +660,7 @@
    <Compile Include="Models\TechnologyParameter.cs" />
    <Compile Include="Models\TechnologyParameterUnit.cs" />
    <Compile Include="Models\TechParamByProc.cs" />
    <Compile Include="Models\WorkCenter.cs" />
    <Compile Include="Models\Xt_CheckFlowMain.cs" />
    <Compile Include="Models\Xt_CheckFlowSub.cs" />
    <Compile Include="Models\Xt_CheckItem.cs" />

 WebAPI/WebServer.cs

@@ -7992,6 +7992,22 @@
        }
        #endregion

        #region [获取默认打印模板]
        /// <summary>
        /// é»˜è®¤æ‰“印模板
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="sErr"></param>
        /// <returns></returns>
        public DataSet GetDefaultOpenTmp(string sWhere, ref string sErr)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet ds = new DataSet();
            ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
            return ds;
        }
        #endregion

        //返回条码临时表
        /// <summary>
        /// è¿”回条码临时表