1
ch
2023-03-30 b7ede349929b44bd664d059728919f6c8eede66a
1
49个文件已修改
10个文件已添加
4208 ■■■■ 已修改文件
DAL/DAL.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/基础资料/公用基础资料/ClsGy_TaxMIX_Ctl.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/车间管理/ClsSc_ProcExchRecordBackBill.cs 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/车间管理/ClsSc_ProcExchSendWorkBill.cs 232 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/车间管理/ClsSc_ProcExchWorkBackBill.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/车间管理/ClsSc_ProcessExchangeBill.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/业务单据/ClsXt_BaseBill.cs 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/基础资料/基础资料/ClsGy_COMMONCONTACT_Model.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/ClsSc_ICMOBillSub.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcExchRecordBackBillMain.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcExchRecordBackBillSub.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcExchSendWorkBillMain.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcExchSendWorkBillSub.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_StationOutBillSub_Emp.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/销售管理/ClsXs_SeOrderBillMain.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/销售管理/ClsXs_SeOrderBillSub.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/销售管理/ClsXs_SeOutStockBillMain.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/销售管理/ClsXs_SeOutStockBillSub.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 263 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs 103 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 274 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 627 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcExchRecordBackBillController.cs 432 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs 270 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessSendWorkController.cs 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MoveStockBillController.cs 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/OtherInStockController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/OtherOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/ProductInController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_MaterTypeBillController.cs 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_TaxMIXController.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsGy_Material_Ctl.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsGy_Material_Model.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/HBarCodeList.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/HSouceOrderList.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 254 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/DAL.csproj
@@ -622,6 +622,8 @@
    <Compile Include="质检管理\ClsQC_POStockInCheckBill.cs" />
    <Compile Include="质检管理\ClsQC_ProcessCheckBill.cs" />
    <Compile Include="质检管理\ClsQC_ProdReportCheckBill.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBill.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchSendWorkBill.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchWorkBackBill.cs" />
    <Compile Include="车间管理\ClsSc_CutMaterProcExchBill.cs" />
    <Compile Include="车间管理\ClsSc_MaterBackBill.cs" />
DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_TaxMIX_Ctl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Data;
using DBUtility;
namespace DAL
{
@@ -27,13 +28,31 @@
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark +
                    "','" + oModel.HUseFlag + "'," + oModel.HUSEORGID + "," + oModel.HCREATEORGID + ",'" + oModel.HMakeEmp + "','" + System.DateTime.Now + "','" + oModel.HCheckEmp + "','" + oModel.HModifyEmp + "','" + oModel.HStopEmp +  "'" + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //获取数据
                DataSet Ds;
                Int64 ItemID = 0;
                Ds = oCn.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxMIXMain" , "Gy_TaxMIXMain");
                if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
                {
                    ItemID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString());
                }
                //插入子表
                foreach (Model.ClsGy_TaxMIXSub_Model oSub in DetailColl)
                {
                     DataSet Cs;
                    Int64 EntryID = 0;
                    Cs = oCn.RunProcReturn("select MAX(HEntryID) HEntryID from Gy_TaxMIXSub", "Gy_TaxMIXSub");
                    if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                    {
                        EntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) + 1;
                    }
                    oCn.RunProc("Insert into Gy_TaxMIXSub " +
                      " (HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID" +
                      " (HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID,HEntryID" +
                      ") values("
                      + "'" + oSub.HTAXBENCHMARK + "'," + oSub.FTAXRATEID + ",'" + oSub.FTAXBENCHMARKCORRVALUE + "'," + oModel.HItemID +
                      + "'" + oSub.HTAXBENCHMARK + "'," + oSub.FTAXRATEID + ",'" + oSub.FTAXBENCHMARKCORRVALUE + "'," + ItemID + "," + EntryID +
                      ") ");
                }
DAL/³µ¼ä¹ÜÀí/ClsSc_ProcExchRecordBackBill.cs
New file
@@ -0,0 +1,136 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
namespace DAL
{
    public  class ClsSc_ProcExchRecordBackBill : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsSc_ProcExchRecordBackBillMain omodel = new Model.ClsSc_ProcExchRecordBackBillMain();
        public List<Model.ClsSc_ProcExchRecordBackBillSub> DetailColl = new List<Model.ClsSc_ProcExchRecordBackBillSub>();
        public ClsSc_ProcExchRecordBackBill()
        {
            base.MvarItemKeySub = "Sc_ProcExchRecordBackBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey= "Sc_ProcExchRecordBackBillMain";
            base.MvarReportTitle= "工序返工记录单";
            base.BillType = "3797";
            base.HBillSubType = "3797";
        }
        #region å›ºå®šä»£ç 
        ~ClsSc_ProcExchRecordBackBill()
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sc_ProcExchRecordBackBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                //",HYear='" + omodel.HYear.ToString() + "'" +
                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + omodel.HMaker + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HInnerBillNo='" + omodel.HInnerBillNo.ToString() +"'"+
                ",HEmpID=" + omodel.HEmpID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsSc_ProcExchRecordBackBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_ProcExchRecordBackBillSub (HInterID, HEntryID, HCloseMan, HEntryCloseDate, HCloseType" +
                         ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" +
                        ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" +
                        ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" +
                        ", HQty, HICMOInterID, HICMOBillNo, HICMOEntryID)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', null, {(oSub.HCloseType == true ? 1 : 0)}" +
                        $",'{oSub.HRemark.ToString()}', {omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()}, '{omodel.HProcExchBillNo.ToString()}', '3772'" +
                        $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" +
                        $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag == true ? 1 : 0)}" +
                        $", {oSub.HQty.ToString()},{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID}) ");
                }
                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);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("insert Into Sc_ProcExchRecordBackBillMain(HBillType, HBillSubType, HInterID, HBillNo, HDate,HBillStatus" +
                    ", HMaker, HMakeDate, HYear, HPeriod, HRemark" +
                    ", HICMOInterID, HICMOBillNo, HICMOEntryID, HProcExchInterID, HProcExchEntryID" +
                    ", HProcExchBillNo, HProcExchBegNO, HProcExchEndNO, HProcBegID, HProcEndID" +
                    ", HMaterID, HUnitID, HEmpID, HPlanQty, HQty" +
                    ", HExplanation, HInnerBillNo, HWorkShopID, HOrderProcNo, HPRDORGID) values(" +
                    $"'{omodel.HBillType}','{omodel.HBillSubType}',{omodel.HInterID},'{omodel.HBillNo}','{omodel.HDate}',1" +
                    $",'{omodel.HMaker}','{omodel.HMakeDate}',{omodel.HYear},{omodel.HPeriod},'{omodel.HRemark}'" +
                    $",{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID},{omodel.HProcExchInterID},{omodel.HProcExchEntryID}" +
                    $",'{omodel.HProcExchBillNo}',{omodel.HProcExchBegNO},{omodel.HProcExchEndNO},{omodel.HProcBegID},{omodel.HProcEndID}" +
                    $",{omodel.HMaterID},{omodel.HUnitID},{omodel.HEmpID},{omodel.HPlanQty},{omodel.HQty}" +
                    $",'{omodel.HExplanation}','{omodel.HInnerBillNo}',{omodel.HWorkShopID},'{omodel.HOrderProcNo}',{omodel.HPRDORGID})");
                //插入子表
                foreach (Model.ClsSc_ProcExchRecordBackBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_ProcExchRecordBackBillSub (HInterID, HEntryID, HCloseMan, HEntryCloseDate, HCloseType" +
                       ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" +
                        ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" +
                        ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" +
                        ", HQty, HICMOInterID, HICMOBillNo, HICMOEntryID)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', null, {(oSub.HCloseType == true ? 1 : 0)}" +
                        $",'{oSub.HRemark.ToString()}', {omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()}, '{omodel.HProcExchBillNo.ToString()}', '3772'" +
                        $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" +
                        $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag == true ? 1 : 0)}" +
                        $", {oSub.HQty.ToString()},{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID}) ");
                }
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
    }
}
DAL/³µ¼ä¹ÜÀí/ClsSc_ProcExchSendWorkBill.cs
New file
@@ -0,0 +1,232 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
namespace DAL
{
    public class ClsSc_ProcExchSendWorkBill : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsSc_ProcExchSendWorkBillMain omodel = new Model.ClsSc_ProcExchSendWorkBillMain();
        public List<Model.ClsSc_ProcExchSendWorkBillSub> DetailColl = new List<Model.ClsSc_ProcExchSendWorkBillSub>();
        public ClsSc_ProcExchSendWorkBill()
        {
            base.MvarItemKeySub = "Sc_ProcExchSendWorkBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Sc_ProcExchSendWorkBillMain";
            base.MvarReportTitle = "工序流转卡派工单";
            base.BillType = "3798";
            base.HBillSubType = "3798";
        }
        #region å›ºå®šä»£ç 
        ~ClsSc_ProcExchSendWorkBill()
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sc_ProcExchSendWorkBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HWorkShopID='" + omodel.HWorkShopID + "'" +
                ",HPRDORGID='" + omodel.HPRDORGID + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                DataSet Ds;
                foreach (Model.ClsSc_ProcExchSendWorkBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_ProcExchSendWorkBillSub " +
                     " (HInterID,HEntryID,HBillNo_bak," +
                     "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                     "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                     "HProcNo,HMaterID,HUnitID,HPlanQty,HQty" +
                     ",HSourceID,HWorkerID,HWorkerNumber,HGroupID,HGroupNumber,HBatchNo,HPlanBeginDate" +
                     ",HPlanEndDate,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HICMOInterID,HICMOBillNo" +
                     ",HICMOEntryID" +
                     ") values(" +
                     omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'" +
                     ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                     "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                     "," + oSub.HProcNo.ToString() + "," + oSub.HMaterID + "," + oSub.HUnitID + ",'" + oSub.HPlanQty + "'," + oSub.HQty + "," + oSub.HSourceID +
                     "," + oSub.HWorkerID + ",'" + oSub.HWorkerNumber + "'," + oSub.HGroupID + ",'" + oSub.HGroupNumber + "','" + oSub.HBatchNo + "','" + oSub.HPlanBeginDate + "','" + oSub.HPlanEndDate +
                     "'," + oSub.HWWOrderInterID + "," + oSub.HWWOrderEntryID + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HICMOInterID + ",'" + oSub.HICMOBillNo + "'," + oSub.HICMOEntryID + ") ");
                }
                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);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Sc_ProcExchSendWorkBillMain   " +
                "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HMaker,HMakeDate" +
                ",HRemark,HBackRemark,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
                ",HPrintQty,HWorkShopID,HExplanation,HInnerBillNo,HPRDORGID" +
                ") " +
                " values(" + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HDate + "','" + omodel.HBillNo + "'," + omodel.HBillStatus + ",'" + omodel.HMaker + "'," + "getdate()" +
                ",'" + omodel.HRemark + "','" + omodel.HBackRemark + "','" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID +
                "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HPrintQty + "," + omodel.HWorkShopID + ",'" + omodel.HExplanation +
                "','" + omodel.HInnerBillNo + "'," + omodel.HPRDORGID + ") ");
                //插入子表
                DataSet Ds;
                foreach (Model.ClsSc_ProcExchSendWorkBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_ProcExchSendWorkBillSub " +
                      " (HInterID,HEntryID,HBillNo_bak," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HProcNo,HMaterID,HUnitID,HPlanQty,HQty" +
                      ",HSourceID,HWorkerID,HWorkerNumber,HGroupID,HGroupNumber,HBatchNo,HPlanBeginDate" +
                      ",HPlanEndDate,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HICMOInterID,HICMOBillNo" +
                      ",HICMOEntryID" +
                      ") values("+
                      omodel.HInterID + "," + oSub.HEntryID + ",'" + omodel.HBillNo + "'" +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HProcNo.ToString() + "," + oSub.HMaterID + "," + oSub.HUnitID + ",'" + oSub.HPlanQty + "'," + oSub.HQty + "," + oSub.HSourceID +
                      "," + oSub.HWorkerID + ",'" + oSub.HWorkerNumber + "'," + oSub.HGroupID + ",'" + oSub.HGroupNumber + "','" + oSub.HBatchNo + "','" + oSub.HPlanBeginDate + "','" + oSub.HPlanEndDate +
                      "'," + oSub.HWWOrderInterID + "," + oSub.HWWOrderEntryID + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HICMOInterID + ",'" + oSub.HICMOBillNo + "'," + oSub.HICMOEntryID + ") ");
                }
                //
                //
                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 Sc_ProcExchSendWorkBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcExchSendWorkBillMain");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到!";
                    return false;
                }
                //固定赋值===========================================
                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
                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.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
                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.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.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                //========================================================
                //==
                omodel.HExplanation = Ds.Tables[0].Rows[0]["HExplanation"].ToString().Trim();
                omodel.HInnerBillNo = Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString().Trim();
                //
                omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
                omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
                omodel.HMainSourceBillNo = Ds.Tables[0].Rows[0]["HMainSourceBillNo"].ToString().Trim();
                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Sc_ProcExchSendWorkBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_ProcExchSendWorkBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsSc_ProcExchSendWorkBillSub oSub = new Model.ClsSc_ProcExchSendWorkBillSub();
                    // å›ºå®šèµ‹å€¼===============================================
                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
                    oSub.HBillNo_bak = DsSub.Tables[0].Rows[i]["HBillNo_bak"].ToString().Trim();
                    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.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]);
                    oSub.HICMOBillNo = DsSub.Tables[0].Rows[i]["HICMOBillNo"].ToString().Trim();
                    oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWWOrderInterID"]);
                    oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWWOrderEntryID"]);
                    oSub.HWWOrderBillNo = DsSub.Tables[0].Rows[i]["HWWOrderBillNo"].ToString().Trim();
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功!";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                throw (e);
            }
        }
    }
}
DAL/³µ¼ä¹ÜÀí/ClsSc_ProcExchWorkBackBill.cs
@@ -41,7 +41,7 @@
                //更新主表
                oCn.RunProc("UpDate Sc_ProcExchWorkBackBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                //",HDate='" + omodel.HDate + "'" +
                ",HDate='" + omodel.HDate + "'" +
                //",HYear='" + omodel.HYear.ToString() + "'" +
                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
@@ -63,12 +63,12 @@
                        ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" +
                        ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" +
                        ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" +
                        ", HQty)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', GETDATE(), {(oSub.HCloseType == true ? 1 : 0)}" +
                        $",'{oSub.HRemark.ToString()}', {oSub.HSourceInterID.ToString()},{oSub.HSourceEntryID.ToString()}, '{oSub.HSourceBillNo.ToString()}', '{oSub.HSourceBillType.ToString()}'" +
                        ", HQty, HICMOInterID, HICMOBillNo, HICMOEntryID)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', null, {(oSub.HCloseType == true ? 1 : 0)}" +
                        $",'{oSub.HRemark.ToString()}', {omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()}, '{omodel.HProcExchBillNo.ToString()}', '3772'" +
                        $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" +
                        $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag == true ? 1 : 0)}" +
                        $", {oSub.HQty.ToString()}) ");
                        $", {oSub.HQty.ToString()},{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID}) ");
                }
                sReturn = "修改单据成功!";
@@ -111,12 +111,12 @@
                        ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" +
                        ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" +
                        ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" +
                        ", HQty)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', GETDATE(), {(oSub.HCloseType== true ? 1:0)}" +
                        $",'{oSub.HRemark.ToString()}', {oSub.HSourceInterID.ToString()},{oSub.HSourceEntryID.ToString()}, '{oSub.HSourceBillNo.ToString()}', '{oSub.HSourceBillType.ToString()}'" +
                        ", HQty, HICMOInterID, HICMOBillNo, HICMOEntryID)values(" +
                        $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', null, {(oSub.HCloseType== true ? 1:0)}" +
                        $",'{oSub.HRemark.ToString()}', {omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()}, '{omodel.HProcExchBillNo.ToString()}', '3772'" +
                        $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" +
                        $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag== true?1:0)}" +
                        $", {oSub.HQty.ToString()}) ");
                        $", {oSub.HQty.ToString()},{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID}) ");
                }
               
                sReturn = "新增单据成功!";
DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs
@@ -9,6 +9,7 @@
    {
        public Model.ClsSc_ProcessExchangeBillMain omodel = new Model.ClsSc_ProcessExchangeBillMain();
        public List<Model.ClsSc_ProcessExchangeBillSub> DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public ClsSc_ProcessExchangeBill()
        {
@@ -92,7 +93,16 @@
                ",HEquipMentID=" + omodel.HEquipMentID.ToString() +
                ",HProjectNum='" + omodel.HProjectNum.ToString() + "'" +
                ",HMateOutBatchNo='" + omodel.HMateOutBatchNo + "'" +
                ",HBLFlag='" + (omodel.HBLFlag ? 1 : 0) + "'" +
                ",HXTNumber='" + omodel.HXTNumber  + "'" +
                ",HXTModel='" + omodel.HXTModel + "'" +
                ",HCusNumber='" + omodel.HCusNumber + "'" +
                ",HMaterModel='" + omodel.HMaterModel + "'" +
                ",HWidth='" + omodel.HWidth + "'" +
                ",HWeight='" + omodel.HWeight + "'" +
                ",HAuxQty='" + omodel.HAuxQty + "'" +
                ",HAuxUnit='" + omodel.HAuxUnit + "'" +
                ",HSplitNo='" + omodel.HSplitNo + "'" +
                ",HProdMaterCode='" + omodel.HProdMaterCode + "'" +
                ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
                ",HCusShortName='" + omodel.HCusShortName + "'" +
@@ -306,8 +316,8 @@
                ",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
                ",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
                ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+ "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo +
                "',"+ omodel.HRoutingBillID + ") ");
                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','" + (omodel.HBLFlag ? 1 : 0) + "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo +
                "',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +")" );
                sErr = sErr + "1;";
                //插入子表
                foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -397,6 +407,37 @@
                sErr = sErr + "7;";
                //工序流转卡保存时自动同步条码信息至条码档案(Y è‡ªåŠ¨åŒæ­¥)
                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBillByOrgID(omodel.HPRDORGID, ref sErrMsg) == true)
                {
                    if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //系统参数  å·¥åºæµè½¬å¡ä¿å­˜æ—¶è‡ªåŠ¨åŒæ­¥æ¡ç ä¿¡æ¯è‡³æ¡ç æ¡£æ¡ˆ
                    {
                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                            ") values ("
                            + "'" + omodel.HBillNo + "','唯一条码'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
                            + ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
                            + ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
                            + ",1,1,0,0,0,'工序流转卡保存自动同步'"
                            + ",0,'',getdate(),'',getdate()"
                            + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
                            + ",'','','',0,'','')");
                    }
                }
                else
                {
                    sReturn = "获取系统参数失败! " + sErrMsg;
                    oCn.RollBack();
                    return false;
                }
                //
                sReturn = "新增单据成功!";
                oCn.Commit();
@@ -484,6 +525,14 @@
                omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
                omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
                omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
                omodel.HRoutingBillID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRoutingBillID"]);
                omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPRDORGID"]);
                omodel.HMaterModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterModel"]);
                omodel.HWidth = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWidth"]);
                omodel.HWeight = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWeight"]);
                omodel.HAuxQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HAuxQty"]);
                omodel.HAuxUnit = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HAuxUnit"]);
                omodel.HSplitNo = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSplitNo"]);
                //
                //循环
                DataSet DsSub;
DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBill.cs
@@ -48,8 +48,20 @@
        public bool AbandonCancelltion(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null Where HInterID=" + lngBillKey.ToString());
            {
                DataSet ds = oCn.RunProcReturn("select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString(), MvarItemKey);
                if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=3 Where HInterID=" + lngBillKey.ToString());
                }
                else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
                }
                else
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
                }
                sReturn = "";
                return true;
            }
@@ -63,8 +75,21 @@
        public bool CancelClose(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null Where HInterID=" + lngBillKey.ToString());
            {
                DataSet ds = oCn.RunProcReturn("select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString(), MvarItemKey);
                if (ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=4 Where HInterID=" + lngBillKey.ToString());
                }
                else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
                }
                else
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
                }
                sReturn = "";
                return true;
            }
@@ -83,8 +108,21 @@
                return false;
            }
            try
            {
                oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null Where HInterID=" + lngBillKey.ToString());
            {
                DataSet ds = oCn.RunProcReturn("select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString(), MvarItemKey);
                if (ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=4 Where HInterID=" + lngBillKey.ToString());
                }
                else if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=3 Where HInterID=" + lngBillKey.ToString());
                }
                else
                {
                    oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
                }
                sReturn = "";
                return true;
            }
@@ -102,7 +140,7 @@
            {
                string  HChecker = ClsPub.CurUserName ;
                string  HCheckDate =ClsPub.GetServerDate(-1);
                oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
                oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
                sReturn = "";
                return true;
            }
@@ -138,7 +176,7 @@
            {
                string HCloseMan = ClsPub.CurUserName;
                string HCloseDate = ClsPub.GetServerDate(-1); 
                oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='" + HCloseMan + "',HCloseDate='" + HCloseDate + "' Where HInterID=" + lngBillKey.ToString());
                oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='" + HCloseMan + "',HCloseDate='" + HCloseDate + "',HBillStatus=3 Where HInterID=" + lngBillKey.ToString());
                sReturn = "";
                return true;
            }
@@ -173,7 +211,7 @@
            {
                string HDeleteMan = ClsPub.CurUserName;
                string HDeleteDate = ClsPub.GetServerDate(-1);
                oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='" + HDeleteMan + "',HDeleteDate='" + HDeleteDate + "' Where HInterID=" + lngBillKey.ToString());
                oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='" + HDeleteMan + "',HDeleteDate='" + HDeleteDate + "',HBillStatus=4 Where HInterID=" + lngBillKey.ToString());
                sReturn = "";
                return true;
            }
Model/Model.csproj
@@ -580,6 +580,10 @@
    <Compile Include="生产管理\模具管理\ClsSc_MouldStockBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillSub.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillMain.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillSub.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchSendWorkBillMain.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchSendWorkBillSub.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchWorkBackBillSub.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchWorkBackBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipWorkBeforeCheckBillMain.cs" />
@@ -712,6 +716,7 @@
    <Compile Include="车间管理\ClsSc_StationInBillSub.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillMain.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub_Emp.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub_Item.cs" />
    <Compile Include="车间管理\ClsSc_ABJJDMain.cs" />
    <Compile Include="车间管理\ClsWW_EntrustWorkOrderBillMain.cs" />
Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_COMMONCONTACT_Model.cs
@@ -16,5 +16,6 @@
        public string HStopEmp { get; set; }
        public int HUSEORGID { get; set; }
        public int HCREATEORGID { get; set; }
        public int HCUSTID { get; set; }
    }
}
Model/Éú²ú¹ÜÀí/ClsSc_ICMOBillSub.cs
@@ -20,6 +20,8 @@
        public DateTime? HEndDate;
        public Int64 HBomID;
        public Int64 HCusID;
        public Int64 HSTOCKINORGID;
        public Int64 HSEQ; //单据行号
        public string HINSTOCKTYPE;      //入库类型,
        public Int64 HCHECKPRODUCT;        //产品检验,
@@ -30,7 +32,12 @@
        public Int64 HSeOrderEntrySEQ;        //销售订单行号,
        public string HPROJECTNO;   //项目编号,
        public Int64 HPRODUCTTYPE;            //产品类型,
        public Int64 HCOSTRATE;            // æƒé‡,
        public double HCOSTRATE;            // æƒé‡,
        public Int64 HBASEUNITID;        //基本计量单位,
        public string HBatchNo;     //生产批次号,
        public double HAuxQty; //辅数量
        public int HAuxUnit; //辅助单位
        public double HWidth; //幅宽
        public double HWeight; //克重
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchRecordBackBillMain.cs
New file
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_ProcExchRecordBackBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HPrintQty { get; set; }  //打印次数
        public Int64 HICMOInterID { get; set; }
        public Int64 HICMOEntryID { get; set; }
        public Int64 HProcExchInterID { get; set; }
        public Int64 HProcExchEntryID { get; set; }
        public Int64 HProcExchBegNO { get; set; }
        public Int64 HProcExchEndNO { get; set; }
        public Int64 HProcBegID { get; set; }
        public Int64 HProcEndID { get; set; }
        public Int64 HMaterID { get; set; }
        public Int64 HUnitID { get; set; }
        public Int64 HEmpID { get; set; }
        public Int64 HWorkShopID { get; set; }
        public Int64 HPRDORGID { get; set; }
        public string HICMOBillNo { get; set; }
        public string HProcExchBillNo { get; set; }
        public string HExplanation { get; set; }
        public string HBatchNo { get; set; }
        public string HOrderProcNo { get; set; }
        public string HInnerBillNo { get; set; }
        public double HPlanQty { get; set; }
        public double HQty { get; set; }
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchRecordBackBillSub.cs
New file
@@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_ProcExchRecordBackBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public string HBillNo_bak;        //单据号(备份,以免内码丢失,找不到对应主表)
        public Int64 HItemSubID; //自增列(GUID)
        public Int64 HProcNo { get; set; }
        public Int64 HProcID { get; set; }
        public Int64 HCenterID { get; set; }
        public Int64 HSupID { get; set; }
        public Int64 HDeptID { get; set; }
        public Int64 HICMOInterID { get; set; }
        public Int64 HSeOrderInterID { get; set; }
        public Int64 HSeOrderEntryID { get; set; }
        public Int64 HICMOEntryID { get; set; }
        public Int64 HWWOrderInterID { get; set; }
        public Int64 HWWOrderEntryID { get; set; }
        public bool HSupFlag { get; set; }
        public string HWorkRemark { get; set; }
        public string HMouldNo { get; set; }
        public string HWWOrderBillNo { get; set; }
        public string HProcWorkNum { get; set; }
        public string HICMOBillNo { get; set; }
        public string HSeOrderBillNo { get; set; }
        public string HTimeUnit { get; set; }
        public string HProcType { get; set; }
        public double HQty { get; set; }
        public double HPlanWorkTimes { get; set; }
        public double HStdWorkTime { get; set; }
        public DateTime HPlanBeginDate { get; set; }
        public DateTime HPlanEndDate { get; set; }
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchSendWorkBillMain.cs
New file
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_ProcExchSendWorkBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HWorkShopID; //生产车间
        public string HExplanation; //摘要
        public string HInnerBillNo; //内部单据号
        public Int64 HPrintQty;
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchSendWorkBillSub.cs
New file
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_ProcExchSendWorkBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public string HBillNo_bak; //单据号(备份,以免内码丢失,找不到对应主表)
        public Int64 HProcNo;
        public Int64 HMaterID;
        public Int64 HUnitID;
        public decimal HPlanQty;
        public decimal HQty;
        public Int64 HSourceID;
        public Int64 HWorkerID;
        public string HWorkerNumber;
        public Int64 HGroupID;
        public string HGroupNumber;
        public string HBatchNo;
        public DateTime HPlanBeginDate;
        public DateTime HPlanEndDate;
        public Int64 HWWOrderInterID;
        public Int64 HWWOrderEntryID;
        public string HWWOrderBillNo;
        public Int64 HICMOInterID;
        public string HICMOBillNo;
        public Int64 HICMOEntryID;
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillMain.cs
@@ -73,5 +73,11 @@
        public string HXTNumber;
        public string HXTModel;
        public string HRoutingBillID;//工艺路线ID
        public string HMaterModel;//材料规格
        public double HWidth;//幅宽
        public double HWeight;//克重
        public double HAuxQty;//辅数量
        public int HAuxUnit;//辅助单位
        public int HSplitNo;//拆分号
    }
}
Model/³µ¼ä¹ÜÀí/ClsSc_StationOutBillSub_Emp.cs
New file
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_StationOutBillSub_Emp : DBUtility.ClsXt_BaseBillSub
    {
        public string HBillNo_bak; //单据号(备份,以免内码丢失,找不到对应主表)
        public Int64 HItemSubID; //自增列(GUID)
        public Int64 HWorkEmpID; //操作员(Gy_Employee)
        public Int64 HWorkSourceID; //生产资源(Gy_Source)
        public decimal HQty ; //生产数量
        public decimal HRate;//员工系数
        public decimal HProcPrice;//工价
        public decimal HMoney; //金额
        public Int64 HWorkProcID; //工序(Gy_Process)
    }
}
Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillMain.cs
@@ -40,5 +40,14 @@
        public Int64 HERPInterID;
        public string HERPBillType;
        public Int64 HSALEORGID;
        public Int64 HSALEGROUPID;
        public Int64 HRECEIVEID;
        public Int64 HSETTLEID;
        public Int64 HCHARGEID;
        public Int64 HHEADLOCID;
        public Int64 HRECCONTACTID;
        public Int64 HCORRESPONDORGID;
        public string HBUSINESSTYPE;
    }
}
Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillSub.cs
@@ -41,6 +41,40 @@
        public decimal HBackRelationQty;
        public Int64 HWhID;
        public Int64 HSPID;
        public decimal HLineTotal;
        public Int64 HSTOCKORGID;
        public Int64 HOWNERID;
        public string HOWNERTYPEID;
        public string HMAPID;
        public Int64 HSTOCKUNITID;
        public Int64 HBASEUNITID;
        public string HBFLOWID;
        public Int64 HSETTLEORGID;
        public Int64 HTAXCOMBINATION;
        public Int64 HPRICEUNITID;
        public Int64 HISFREE;
        public decimal HPRICECOEFFICIENT;
        public decimal HSYSPRICE;
        public decimal HLIMITDOWNPRICE;
        public Int64 HPARENTMATID;
        public string HROWTYPE;
        public string HROWID;
        public string HPARENTROWID;
        public Int64 HDELIVERYCONTROL;
        public Int64 HLOCALCURRID;
        public Int64 HEXCHANGETYPEID;
        public Int64 HSETTLECURRID;
        public Int64 HSETTLEMODEID;
        public Int64 HRECCONDITIONID;
        public Int64 HISINCLUDEDTAX;
        public Int64 HISPRICEEXCLUDETAX;
        public decimal HEXCHANGERATE;
        public Int64 HTAXRATEID;
        public decimal HCOSTPERCENT;
        public Int64 HVAT;
        public Int64 HSELLERWITHHOLDING;
        public Int64 HBUYERWITHHOLDING;
        public Int64 HPRICELISTENTRY;
    }
}
Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOutStockBillMain.cs
@@ -32,5 +32,18 @@
        public Int64 HERPInterID;
        public string HERPBillType;
        public Int64 HSTOCKERGROUPID;
        public Int64 HSALEGROUPID;
        public Int64 HSALEDEPTID;
        public string HBUSINESSTYPE;
        public Int64 HCARRIERID;
        public Int64 HRECEIVERID;
        public Int64 HSETTLEID;
        public Int64 HPAYERID;
        public Int64 HHEADLOCID;
        public Int64 HRECCONTACTID;
        public Int64 HRECEIPTCONDITIONID;
        public Int64 HCORRESPONDORGID;
        public string HCARRIAGENO;
    }
}
Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOutStockBillSub.cs
@@ -21,7 +21,7 @@
        public Int64 HSPID;
        public Int64 HOWNERID;
        public string HOWNERTYPEID;
        public Int64 HSETTLEORGID;
        public string HSETTLEORGID;
        public double HMoveStockQty;
        public Int64 HAuxPropID;
        public string HBatchNO;
@@ -29,5 +29,39 @@
        public Int64 HERPInterID;
        public Int64 HERPEntryID;
        public string HSeORderBillNo;
        public string HCUSTMATID;
        public Int64 HBASEUNITID;
        public string HBFLOWID;
        public Int64 HOUTCONTROL;
        public Int64 HSTOCKUNITID;
        public string HROWTYPE;
        public string HROWID;
        public string HPARENTROWID;
        public Int64 HPARENTMATID;
        public Int64 HTAXCOMBINATION;
        public double HPRICECOEFFICIENT;
        public double HSYSPRICE;
        public double HLIMITDOWNPRICE;
        public Int64 HPRICEUNITID;
        public double HTAXPRICE;
        public double HTAXRATE;
        public double HTAXNETPRICE;
        public double HDISCOUNTRATE;
        public Int64 HISFREE;
        public Int64 HLOCALCURRID;
        public Int64 HSETTLECURRID;
        public Int64 HEXCHANGETYPEID;
        public Int64 HSETTLETYPEID;
        public Int64 HRECEIPTCONDITIONID;
        public double HEXCHANGERATE;
        public Int64 HISINCLUDEDTAX;
        public Int64 HISPRICEEXCLUDETAX;
        public Int64 HTAXRATEID;
        public double HTaxRate_TAX;
        public double HCOSTPERCENT;
        public Int64 HVAT;
        public Int64 HSELLERWITHHOLDING;
        public Int64 HBUYERWITHHOLDING;
    }
}
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1313,7 +1313,19 @@
                    {
                        omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //进站接收单是否自动匹配对应流水号
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_AutoFindSNO")
                    {
                        omodel.MES_StationInBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //进站接收单只显示用户对应工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_ShowUSERProcess")
                    {
                        omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //===============出站单
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
@@ -1330,6 +1342,39 @@
                    {
                        omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //首道工序出站后自动生成ERP生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FstAutoICMOReport")
                    {
                        omodel.MES_StationOutBill_FstAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //末道工序出站后自动生成ERP生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_LastAutoICMOReport")
                    {
                        omodel.MES_StationOutBill_LastAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //末道工序出站后自动生成ERP生产入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoStockIn")
                    {
                        omodel.MES_StationOutBill_AutoStockIn = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //末道工序自动入库时仓库取值类型(物料、工序、工艺路线)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
                    {
                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站汇报单是否自动匹配对应流水号
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoFindSNO")
                    {
                        omodel.MES_StationOutBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站汇报单只显示用户对应工序
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_ShowUSERProcess")
                    {
                        omodel.MES_StationOutBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=====不良评审单
                    //不良品数不能大于出站单报废数量
@@ -1494,12 +1539,19 @@
                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序进站单
                    //自动匹配流水号
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
                    {
                        omodel.MES_StationBill_ProcNo = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    ////=========工序进站单
                    ////自动匹配流水号
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
                    //{
                    //    omodel.MES_StationBill_ProcNo = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    //}
                    ////=========工序进出站
                    ////只显示用户对应工序
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNoByUser")
                    //{
                    //    omodel.MES_StationBill_ProcNoByUser = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    //}
                }
                sReturn = "显示单据成功!";
                return true;
@@ -1523,8 +1575,8 @@
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    //WMS条码 ç³»ç»Ÿå‚æ•°
                    //生产汇报单
                    //========================================================WMS条码 ç³»ç»Ÿå‚æ•°
                    //===========生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
                    {
                        omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1573,7 +1625,7 @@
                    {
                        omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //收料通知单(送货单、到货确认)
                    //========收料通知单(送货单、到货确认)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
                    {
                        omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1586,7 +1638,7 @@
                    {
                        omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购入库单
                    //===========采购入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
                    {
                        omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1632,7 +1684,7 @@
                        omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //产品入库单
                    //===========产品入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
                    {
                        omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1678,7 +1730,7 @@
                        omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库单
                    //=========其他入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
                    {
                        omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1719,7 +1771,7 @@
                    {
                        omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库单  æ ¡éªŒ
                    //============其他入库单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1733,7 +1785,7 @@
                        omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外入库单
                    //=========委外入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
                    {
                        omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1775,7 +1827,7 @@
                        omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产领料单
                    //==========生产领料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
                    {
                        omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1828,7 +1880,7 @@
                    {
                        omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产领料单    æ ¡éªŒ
                    //==========生产领料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1842,7 +1894,7 @@
                        omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售出库单
                    //============销售出库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
                    {
                        omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1899,7 +1951,7 @@
                    {
                        omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售出库单    æ ¡éªŒ
                    //============销售出库单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_SellOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1913,7 +1965,7 @@
                        omodel.Kf_SellOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他出库单
                    //============其他出库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
                    {
                        omodel.Kf_OtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1958,7 +2010,7 @@
                    {
                        omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他出库单  æ ¡éªŒ
                    //===========其他出库单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1972,7 +2024,7 @@
                        omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外出库单
                    //==========委外出库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
                    {
                        omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2021,7 +2073,7 @@
                    {
                        omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外领料单    æ ¡éªŒ
                    //==========委外领料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2035,7 +2087,7 @@
                        omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产补料单
                    //===========生产补料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
                    {
                        omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2072,7 +2124,7 @@
                    {
                        omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产补料单    æ ¡éªŒ
                    //==========生产补料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2086,7 +2138,7 @@
                        omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外补料单
                    //===========委外补料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
                    {
                        omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2123,7 +2175,7 @@
                    {
                        omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外补料单    æ ¡éªŒ
                    //===========委外补料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2137,7 +2189,7 @@
                        omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //直接调拨单
                    //=========直接调拨单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2186,7 +2238,7 @@
                    {
                        omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //直接调拨单  æ ¡éªŒ
                    //==========直接调拨单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2200,7 +2252,7 @@
                        omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //分步式调出单
                    //============分步式调出单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2246,7 +2298,7 @@
                        omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //分步式调入单
                    //===========分步式调入单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2296,7 +2348,7 @@
                        omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购退料单
                    //===============采购退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
                    {
                        omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2334,7 +2386,7 @@
                        omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退库单
                    //===========生产退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
                    {
                        omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2372,7 +2424,7 @@
                        omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库红字
                    //===========其他入库红字
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
                    {
                        omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2410,7 +2462,7 @@
                        omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外退库单
                    //===========委外退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
                    {
                        omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2448,7 +2500,7 @@
                        omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退料单
                    //========生产退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
                    {
                        omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2490,7 +2542,7 @@
                        omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售退库单
                    //==========销售退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
                    {
                        omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2532,7 +2584,7 @@
                        omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他出库红字
                    //=========其他出库红字
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
                    {
                        omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2570,7 +2622,7 @@
                        omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外退料单
                    //===========委外退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
                    {
                        omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2612,7 +2664,7 @@
                        omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //WMS   é€šç”¨
                    //==============================================WMS   é€šç”¨
                    //库存控制-ERP负库存控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
                    {
@@ -2710,10 +2762,42 @@
                    {
                        omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //选源单生产入库单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoProductInBillWMS")
                    {
                        omodel.BarCode_AutoProductInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //选源单采购入库单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoPOStockInBillWMS")
                    {
                        omodel.BarCode_AutoPOStockInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //选源单生产退料单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoMateOutBackBillWMS")
                    {
                        omodel.BarCode_AutoMateOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //选源单销售退货单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoSellOutBackBillWMS")
                    {
                        omodel.BarCode_AutoSellOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==============================================================================================
                    //============================================================================MES系统参数
                    //-==================工序流转卡
                    //工序流转卡保存自动同步条码档案
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
                    {
                        omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //-======进站单
                    //-======工序进站接收单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //先进先出
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_FIFOCtl")
                    {
@@ -2749,12 +2833,32 @@
                    {
                        omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //进站接收单删除时是否进行关联控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteRelationCtl")
                    {
                        omodel.MES_StationInBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //===============出站单
                    //===============工序出站汇报单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量(合格数量或总数量)汇总不能大于上道合格汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyPreQtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyPreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量(合格数量或总数量)汇总不能大于下道合格汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyNextQtyCtl")
                    {
                        omodel.MES_StationOutBill_QtyNextQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出战单判断本道工序是否做首件检验 
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FirstCheckOut")
@@ -2766,6 +2870,17 @@
                    {
                        omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站汇报单删除时是否进行关联控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteRelationCtl")
                    {
                        omodel.MES_StationOutBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序末道入库仓库取值类型  æœ«é“工序自动入库时仓库取值类型(物料、工序、工艺路线)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
                    {
                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=====不良评审单
                    //不良品数不能大于出站单报废数量
@@ -2783,8 +2898,14 @@
                    {
                        omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=======委外发出
                    //=======工序委外发出单//
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工站或工序先进先出(同上)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
                    {
@@ -2811,7 +2932,13 @@
                        omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //===========委外接收单
                    //===========工序委外接收单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //出站数量不能大于本道进站汇总数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
                    {
@@ -2823,14 +2950,10 @@
                        omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序末道入库仓库取值类型
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
                    {
                        omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=======JIT
                    //=======JIT系统参数
                    //==========开班单
                    //自动审核
@@ -2889,34 +3012,13 @@
                    {
                        omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序进站接收单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
                    //=======报工台,工序汇报自动审核参数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                    {
                        omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序出站汇报单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序委外发出单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序委外接收单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
                    {
                        omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=================================================基础资料
                    //=========工艺路线
                    //自动新增   ä¿å­˜åˆ°æ•°æ®åº“时自动加上转工序
@@ -2925,11 +3027,10 @@
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //报工台,工序汇报自动审核参数
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
                    {
                        omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                }
                sReturn = "显示单据成功!";
                return true;
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -10,7 +10,7 @@
        //生产汇报单
        public string Sc_ICMOReportBill_AutoCheck;              //是否自动审核
        public string Sc_ICMOReportBill_ERPMode;                //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Sc_ICMOReportBill_ERPMode;                //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Sc_ICMOReportBill_MustQtyCtl;             //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Sc_ICMOReportBill_MulSourceBill;          //多源单模式
        public string Sc_ICMOReportBill_BillTypeOneScan;        //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -21,15 +21,16 @@
        public string Sc_ICMOReportBill_SourceWHSPCtl;          //是否取源单中仓库仓位('Y'为是)
        public string Sc_ICMOReportBill_UpdateSourceInterID;    //上传后回填条码档案源单信息
        public string Sc_ICMOReportBill_MESFlag;                //生产汇报单同步MES标记,Y为同步
        public string Sc_ICMOReportBill_FirstCheckOut;          //必须首件检验通过才能保存单据
        //收料通知单(送货单、到货确认)
        public string Cg_POInStockBill_AutoCheck;       //是否自动审核
        public string Cg_POInStockBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Cg_POInStockBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Cg_POInStockBill_BarCodeCtl;                 //到货确认必须扫码箱条码
        //采购入库
        public string Kf_POStockInBill_AutoCheck;       //是否自动审核
        public string Kf_POStockInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_POStockInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_POStockInBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_POStockInBill_MulSourceBill;   //多源单模式
        public string Kf_POStockInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -42,7 +43,7 @@
        //产品入库
        public string Kf_ProductInBill_AutoCheck;       //是否自动审核
        public string Kf_ProductInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_ProductInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_ProductInBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_ProductInBill_MulSourceBill;   //多源单模式
        public string Kf_ProductInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -55,7 +56,7 @@
        //其他入库
        public string Kf_OtherInBill_AutoCheck;       //是否自动审核
        public string Kf_OtherInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_OtherInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_OtherInBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_OtherInBill_MulSourceBill;   //多源单模式
        public string Kf_OtherInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -71,7 +72,7 @@
        //委外入库
        public string Kf_EntrustInBill_AutoCheck;       //是否自动审核
        public string Kf_EntrustInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_EntrustInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_EntrustInBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_EntrustInBill_MulSourceBill;   //多源单模式
        public string Kf_EntrustInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -83,7 +84,7 @@
        //生产领料
        public string Kf_MateOutBill_AutoCheck;         //是否自动审核
        public string Kf_MateOutBill_ERPMode;           //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MateOutBill_ERPMode;           //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MateOutBill_MustQtyCtl;        //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MateOutBill_MulSourceBill;     //多源单模式
        public string Kf_MateOutBill_BillTypeOneScan;   //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -102,7 +103,7 @@
        //销售出库
        public string Kf_SellOutBill_AutoCheck;             //是否自动审核
        public string Kf_SellOutBill_ERPMode;               //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_SellOutBill_ERPMode;               //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_SellOutBill_MustQtyCtl;            //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_SellOutBill_MulSourceBill;         //多源单模式
        public string Kf_SellOutBill_BillTypeOneScan;       //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -122,7 +123,7 @@
        //其他出库
        public string Kf_OtherOutBill_AutoCheck;       //是否自动审核
        public string Kf_OtherOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_OtherOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_OtherOutBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_OtherOutBill_MulSourceBill;   //多源单模式
        public string Kf_OtherOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -139,7 +140,7 @@
        //委外出库
        public string Kf_EntrustOutBill_AutoCheck;       //是否自动审核
        public string Kf_EntrustOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_EntrustOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_EntrustOutBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_EntrustOutBill_MulSourceBill;   //多源单模式
        public string Kf_EntrustOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -157,7 +158,7 @@
        //生产补料
        public string Kf_MateReplenishOutBill_AutoCheck;       //是否自动审核
        public string Kf_MateReplenishOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MateReplenishOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MateReplenishOutBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MateReplenishOutBill_MulSourceBill;   //多源单模式
        public string Kf_MateReplenishOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -172,7 +173,7 @@
        //委外补料
        public string Kf_EntrustReplenishOutBill_AutoCheck;       //是否自动审核
        public string Kf_EntrustReplenishOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_EntrustReplenishOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_EntrustReplenishOutBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_EntrustReplenishOutBill_MulSourceBill;   //多源单模式
        public string Kf_EntrustReplenishOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -187,7 +188,7 @@
        //直接调拨
        public string Kf_MoveStockBill_AutoCheck;       //是否自动审核
        public string Kf_MoveStockBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MoveStockBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MoveStockBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MoveStockBill_MulSourceBill;   //多源单模式
        public string Kf_MoveStockBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -205,7 +206,7 @@
        //分步式调出单
        public string Kf_MoveStockStepOutBill_AutoCheck;       //是否自动审核
        public string Kf_MoveStockStepOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MoveStockStepOutBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MoveStockStepOutBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MoveStockStepOutBill_MulSourceBill;   //多源单模式
        public string Kf_MoveStockStepOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -218,7 +219,7 @@
        //分步式调入单
        public string Kf_MoveStockStepInBill_AutoCheck;       //是否自动审核
        public string Kf_MoveStockStepInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MoveStockStepInBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MoveStockStepInBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MoveStockStepInBill_MulSourceBill;   //多源单模式
        public string Kf_MoveStockStepInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -232,7 +233,7 @@
        //采购退料
        public string Kf_POStockInBackBill_AutoCheck;       //是否自动审核
        public string Kf_POStockInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_POStockInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_POStockInBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_POStockInBackBill_MulSourceBill;   //多源单模式
        public string Kf_POStockInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -243,7 +244,7 @@
        //产品退库
        public string Kf_ProductInBackBill_AutoCheck;       //是否自动审核
        public string Kf_ProductInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_ProductInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_ProductInBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_ProductInBackBill_MulSourceBill;   //多源单模式
        public string Kf_ProductInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -254,7 +255,7 @@
        //其他入库红字
        public string Kf_OtherInBackBill_AutoCheck;       //是否自动审核
        public string Kf_OtherInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_OtherInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_OtherInBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_OtherInBackBill_MulSourceBill;   //多源单模式
        public string Kf_OtherInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -265,7 +266,7 @@
        //委外退库
        public string Kf_EntrustInBackBill_AutoCheck;       //是否自动审核
        public string Kf_EntrustInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_EntrustInBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_EntrustInBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_EntrustInBackBill_MulSourceBill;   //多源单模式
        public string Kf_EntrustInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -276,7 +277,7 @@
        //生产退料
        public string Kf_MateOutBackBill_AutoCheck;       //是否自动审核
        public string Kf_MateOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_MateOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_MateOutBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_MateOutBackBill_MulSourceBill;   //多源单模式
        public string Kf_MateOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -288,7 +289,7 @@
        //销售退库
        public string Kf_SellOutBackBill_AutoCheck;                 //是否自动审核
        public string Kf_SellOutBackBill_ERPMode;                   //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_SellOutBackBill_ERPMode;                   //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_SellOutBackBill_MustQtyCtl;                //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_SellOutBackBill_MulSourceBill;             //多源单模式
        public string Kf_SellOutBackBill_BillTypeOneScan;           //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -300,7 +301,7 @@
        //其他出库红字
        public string Kf_OtherOutBackBill_AutoCheck;       //是否自动审核
        public string Kf_OtherOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_OtherOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_OtherOutBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_OtherOutBackBill_MulSourceBill;   //多源单模式
        public string Kf_OtherOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -311,7 +312,7 @@
        //委外退料
        public string Kf_EntrustOutBackBill_AutoCheck;       //是否自动审核
        public string Kf_EntrustOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD)
        public string Kf_EntrustOutBackBill_ERPMode;         //WMS系统同步至ERP的类型(WISE、CLOUD、无)
        public string Kf_EntrustOutBackBill_MustQtyCtl;      //应收数量控制(小于等于应收、完全等于应收、不控制)
        public string Kf_EntrustOutBackBill_MulSourceBill;   //多源单模式
        public string Kf_EntrustOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表)
@@ -344,9 +345,15 @@
        public long BarCode_PrintQty;          //允许条码打印次数(1、2、3.....)
        public string BarCode_PrintQtyCtl;      //条码打印次数控制(是否只允许打印一次控制,Y åªå…è®¸æ‰“印一次)
        public string BarCode_UpdatePrintQtyCtl;//条码打印次数更新(打印条码时,是否更新条码打印次数,Y æ›´æ–°)
        public string BarCode_AutoProductInBillWMS;     //选源单生产入库单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_AutoPOStockInBillWMS;     //选源单采购入库单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_AutoMateOutBackBillWMS;   //选源单生产退料单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_AutoSellOutBackBillWMS;   //选源单销售退货单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        //工序流转卡
        public string Sc_ProcessExchangeBill_AutoBarCode;                //工序流转卡保存自动同步条码档案
        //进站单
        //工序进站接收单
        public string MES_StationInBill_FIFOCtl;                //工站或工序先进先出(本生产资源 æœ‰å•据没有出站则,不能进站其他单据)
        public string MES_StationInBill_FullMoveCtl;             //上道完全出站控制(本道进站时,上道的报废+合格必须等于上道进站数量
        public string MES_StationInBill_QtyCtl;                 //进站数量不能大于上道出站汇总合格数
@@ -355,28 +362,42 @@
        public string MES_StationInBill_ProcessCheckCtl;        //进站单当前工序的上道工序是否做工序检验
        public string MES_StationInBill_DeleteCtl;              //删除单据时制单人与删除人必须一致
        public string MES_StationInBill_LineBindCtl;              //进站接收时是否绑定该工序的配件清单
        //出站单
        public string MES_StationInBill_AutoFindSNO;             //进站接收单是否自动匹配对应流水号
        public string MES_StationInBill_ShowUSERProcess;         //进站接收单只显示用户对应工序
        public string MES_StationInBill_SaveAutoAddnew;         //保存后变为新增状态
        public string MES_StationInBill_DeleteRelationCtl;              //进站接收单删除时是否进行关联控制
        //工序出站汇报单
        public string MES_StationOutBill_QtyCtl;                //出站数量不能大于本道进站汇总数
        public string MES_StationOutBill_QtyPreQtyCtl;                //出站数量(合格数量或总数量)汇总不能大于上道合格汇总数
        public string MES_StationOutBill_QtyNextQtyCtl;                //出站数量(合格数量或总数量)汇总不能大于下道合格汇总数
        public string MES_StationOutBill_ProcessCheckOut;          //必须工序检验通过才能保存单据
        public string MES_StationOutBill_FirstCheckOut;       //出战单判断本道工序是否做首件检验 
        public string MES_StationOutBill_DeleteCtl;             //删除单据时制单人与删除人必须一致
        public string MES_StationOutBill_FstAutoICMOReport;         //首道工序出站后自动生成ERP生产汇报单
        public string MES_StationOutBill_LastAutoICMOReport;        //末道工序出站后自动生成ERP生产汇报单
        public string MES_StationOutBill_AutoStockIn;               //末道工序出站后自动生成ERP生产入库单
        public string MES_StationOutBill_InStockType;               //末道工序自动入库时仓库取值类型(物料、工序、工艺路线)
        public string MES_StationOutBill_AutoFindSNO;             //出站汇报单是否自动匹配对应流水号
        public string MES_StationOutBill_ShowUSERProcess;         //出站汇报单只显示用户对应工序
        public string MES_StationOutBill_SaveAutoAddnew;            //保存后变为新增状态
        public string MES_StationOutBill_DeleteRelationCtl;              //出站汇报单删除时是否进行关联控制
        //不良品评审单
        public string QC_NoPassProdCheckBill_QtyCtl;            //不良品数不能大于出站单报废数量
        public string QC_NoPassProdCheckBill_BadReasonQtyCtrl;  //不良品评审单不良数量和不良原因总数必须一致
        public string QC_NoPassProdCheckBill_DeleteCtl;         //删除单据时制单人与删除人必须一致
        //委外发出
        //工序委外发出单
        public string MES_StationEntrustInBill_FIFOCtl;         //工站或工序先进先出(同上)
        public string MES_StationEntrustInBill_FullMoveCtl;     //上道完全出站控制(同上)
        public string MES_StationEntrustInBill_QtyCtl;          //进站数量不能大于上道出站汇总合格数(同上)
        public string MES_StationEntrustInBill_OneCtl;          //一张流转卡只允许一次委外发出
        public string MES_StationEntrustInBill_DeleteCtl;       //删除单据时制单人与删除人必须一致
        //委外接收
        public string MES_StationEntrustInBill_SaveAutoAddnew; //保存后变为新增状态
        //工序委外接收单
        public string MES_StationEntrustOutBill_QtyCtl;         //出站数量不能大于本道进站汇总数
        public string MES_StationEntrustOutBill_DeleteCtl;      //删除单据时制单人与删除人必须一致
        public string MES_StationEntrustOutBill_SaveAutoAddnew; //保存后变为新增状态
        //生产汇报单
        public string Sc_ICMOReportBill_FirstCheckOut;          //必须首件检验通过才能保存单据
        public string MES_StationOutBill_InStockType;           //工序末道入库仓库取值类型
        //JIT
@@ -405,15 +426,8 @@
        //QMS
        //首件检验单
        public string QC_FirstPieceCheckBill_AutoCheck; //自动审核
        //工序进站接收单
        public string MES_StationInBill_SaveAutoAddnew; //自动新增
        //工序出站汇报单
        public string MES_StationOutBill_SaveAutoAddnew; //自动新增
        //工序委外发出单
        public string MES_StationEntrustInBill_SaveAutoAddnew; //自动新增
        //工序委外接收单
        public string MES_StationEntrustOutBill_SaveAutoAddnew; //自动新增
        public string QC_FirstPieceCheckBill_AutoCheck; //保存后变为新增状态
        //EAM
@@ -427,9 +441,11 @@
        //工艺路线
        public string Gy_RoutingBill_SaveAutoLastProc; //保存到数据库时自动加上转工序
        //工序进站单
        public string MES_StationBill_ProcNo; //自动匹配流水号
        ////工序进站单
        //public string MES_StationBill_ProcNo; //自动匹配流水号
        //public string MES_StationBill_ProcNoByUser; //只显示用户对应工序
    }
         
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -326,10 +326,12 @@
            {
                var model = oMain["model"].ToString();
                var custLocationModel = oMain["model"]["HCustLocationEntry"].ToString();
                var custContactModel = oMain["model"]["HCustContactEntry"].ToString();
                //反序列化
                model = "[" + model + "]";
                List<Customer> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(model);
                List<Model.ClsGy_CustLocation_Model> custLocationls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CustLocation_Model>>(custLocationModel);
                List<Model.ClsGy_COMMONCONTACT_Model> custContactls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_COMMONCONTACT_Model>>(custContactModel);
                string sql = string.Empty;
                oCN.BeginTran();
                sql = $"delete gy_Customer where HItemID = {lsmain[0].HItemID}";
@@ -379,10 +381,30 @@
                }
                sql = "set identity_insert Gy_CustLocation off";
                oCN.RunProc(sql);
                //客户_收货方联系人
                sql = $"delete Gy_COMMONCONTACT where HCUSTID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_COMMONCONTACT on";
                oCN.RunProc(sql);
                foreach (var item in custContactls)
                {
                    sql = $@"insert into Gy_COMMONCONTACT(HItemID,HCUSTID,HNumber,HName,HShortNumber,HParentID,HLevel,HEndFlag,HStopflag,
                    HRemark,HHelpCode,HUseFlag,HMakeTime,HMakeEmp,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HStopEmp,HStopTime,
                    HUSEORGID,HCREATEORGID)
                  values({item.HItemID},{item.HCUSTID},'{item.HNumber}','{item.HName}','{item.HShortNumber}',{item.HParentID},{item.HLevel}
           ,{Convert.ToString(item.HEndFlag ? 1 : 0)},{Convert.ToString(item.HStopflag ? 1 : 0) },'{item.HRemark}','{item.HHelpCode}','{item.HUseFlag}'
            ,'{item.HMakeTime}','{item.HMakeEmp}','{item.HCheckEmp}','{item.HCheckTime}','{item.HModifyEmp}'
            ,'{item.HModifyTime}','{item.HStopEmp}','{item.HStopTime}',{item.HUSEORGID},{item.HCREATEORGID})";
                    oCN.RunProc(sql);
                }
                sql = "set identity_insert Gy_COMMONCONTACT off";
                oCN.RunProc(sql);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功!";
                objJsonResult.Message = "新增基础资料成功!";
                //objJsonResult.data = null;
                return objJsonResult;
            }
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -403,30 +403,64 @@
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HShortNumber;
                string HRemark = list[0].HRemark;
                string HUseFlag = list[0].HUseFlag;
                long HParentID = list[0].HParentID;
                string HBarCode = list[0].HBarCode;
                string HHelpCode = list[0].HHelpCode;
                string HUpDater = list[0].HUpDater;
                string HUpDater = msg3;
                long HEmpID = list[0].HEmpID;
                bool HStopflag = list[0].HStopflag;
                long HSecManagerID = list[0].HSecManagerID;
                //string HCreator = list[0].HCreator;
                long HCreateOrgID = list[0].HCreateOrgID;
                //DateTime HCreateDate = list[0].HCreateDate;
                long HUseOrgID = long.Parse(msg4);
                string HUpdater = list[0].HUpDater;
                long HUseOrgID = list[0].HUseOrgID;
                //DateTime HUpdateDate = list[0].HUpDateDate;
                string HChecker = list[0].HChecker;
                //DateTime HCheckDate = list[0].HCheckDate;
                string HDeleteMan = list[0].HDeleteMan;
                //DateTime HDeleteDate = list[0].HDeleteDate;
                long HLevel = 1;
                //末级标志
                bool HEndFlag = true;
                long HEntityID = 1;
                //得到短代码
                string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
                if (HShortNumber.Trim() == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!短代码为空!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //等级
                int HLevel = DBUtility.ClsPub.GetLevel(HNumber);
                //检查父级是否存在
                long HParentID = 0;
                string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
                if (sParent.Trim() == "")
                {
                    HParentID = 0;
                }
                else
                {
                    ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Department");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!上级代码不存在或被禁用!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }
                //判断权限
                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                //{
@@ -464,10 +498,10 @@
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_Department " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
                        "," + HEntityID.ToString() + "," + HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                        "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -480,12 +514,16 @@
                        " HNumber='" + HNumber + "'" +
                        ",HName='" + HName + "'" +
                        ",HHelpCode='" + HHelpCode + "'" +
                        ",HLevel='" + HLevel + "'" +
                        ",HShortNumber='" + HShortNumber + "'" +
                        ",HBarCodeForBase='" + HBarCode + "'" +
                        ",HParentID=" + HParentID +
                        ",HEmpID=" + HEmpID.ToString() +
                        ",HUSEORGID=" + HUseOrgID.ToString() +
                        ",HCREATEORGID=" + HCreateOrgID.ToString() +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        //",HUpdater='" + HUpdater + "'" +
                        //",HUpdateDate= getdate()" +
                        ",HUpDater='" + HUpDater + "'" +
                        ",HUpDateDate= getdate()" +
                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -572,33 +572,15 @@
                    return objJsonResult;
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                }
                string sql1 = "select top 2000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -313,7 +313,7 @@
                string HOverFixPrice = list[0].HOverFixPrice;
                string HSNo = list[0].HSNo;
                string HBarCode = list[0].HBarCode;
                string HProcMulID = list[0].HProcMulID;
                string HProcMulID = list[0].HProcMulID==null?"0": list[0].HProcMulID;
                string HProcCheckNote = list[0].HProcCheckNote;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
@@ -403,7 +403,7 @@
                        ",HStopflag= '" + HStopflag + "'" +
                        ",HRemark='" + HRemark + "'" +
                        ",HDeptID= " + HDeptID +
                        ",HBarCodeForBase='" + HBarCodeForBase + "'" +
                        ",HBarCodeForBase='" + HBarCode + "'" +
                        ",HProcessID_K3= " + HProcessID_K3 +
                        ",HBillSubType='" + HBillSubType + "'" +
                        ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
@@ -549,7 +549,7 @@
                return objJsonResult;
            }
        }
        /// <summary>Gy_Process/cx
        /// <summary>
        /// å·¥åºåˆ—表删除功能
        /// </summary>
        /// <returns></returns>
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -293,27 +293,6 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = list[0].HShortNumber;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                bool HEndFlag = list[0].HEndFlag;
                bool HStopflag = list[0].HStopFlag;
                string HRemark = list[0].HRemark;
                string HBarCode = list[0].HBarCode;
                long HEmpID = list[0].HEmpID;
                string HAddress = list[0].HAddress;
                string HPhone = list[0].HPhone;
                long HUSEORGID = list[0].HUSEORGID;
                string HUpDater = list[0].HUpDater;
                ////判断权限
                if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
@@ -324,6 +303,63 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                bool HStopflag = list[0].HStopFlag;
                string HRemark = list[0].HRemark;
                string HBarCode = list[0].HBarCode;
                long HEmpID = list[0].HEmpID;
                string HAddress = list[0].HAddress;
                string HPhone = list[0].HPhone;
                long HUSEORGID = list[0].HUSEORGID;
                //long HCREATEORGID = list[0].HCREATEORGID;
                string HUpDater = list[0].HUpDater;
                long HSPFlag = list[0].HSPFlag;
                //得到短代码
                string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
                if (HShortNumber.Trim() == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!短代码为空!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //等级
               int HLevel = DBUtility.ClsPub.GetLevel(HNumber);
                //检查父级是否存在
                long HParentID = 0;
                string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
                if (sParent.Trim() == "")
                {
                    HParentID = 0;
                }
                else
                {
                    ds = oCN.RunProcReturn("select * from Gy_Warehouse where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Warehouse");
                    if (ds.Tables[0].Rows.Count>0)
                    {
                        HParentID =long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!上级代码不存在或被禁用!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }
                //末级标志
                int HEndFlag = 1;
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
@@ -349,11 +385,18 @@
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_Warehouse  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HSPFlag,HCREATEORGID,HMaker,HMakeTime) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                        "," + HLevel.ToString() + "," + HEndFlag + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "',"+ HSPFlag + ","+ HUSEORGID + ",'"+msg3+"',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //启用仓位
                    if (HSPFlag == 1)
                    {
                        //回填 HSPGroupID
                        oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HNumber='" + HNumber + "' and HName='" + HName + "' ", ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    oCN.Commit();
                }
                else { 
@@ -367,12 +410,14 @@
                        ",HHelpCode='" + HHelpCode + "'" +
                        ",HLevel=" + HLevel.ToString() +
                        ",HParentID=" + HParentID.ToString() +
                        ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HEmpID=" + HEmpID.ToString() +
                        ",HAddress='" + HAddress + "'" +
                        ",HPhone='" + HPhone + "'" +
                        ",HUSEORGID='" + HUSEORGID + "'" +
                        ",HCREATEORGID='" + HUSEORGID + "'" +
                        ",HSPFlag='" + HSPFlag + "'" +
                        //",HSPGroupID='" + HSPGroupID + "'" +
                        ",HUpdater='" + HUpDater + "'" +
                        ",HUpdateDate= getdate()" +
                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -381,6 +426,16 @@
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    //启用仓位
                    if (HSPFlag == 1)
                    {
                        //回填 HSPGroupID
                        oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HItemID=" + HItemID , ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    else {
                        //回填 HSPGroupID
                        oCN.RunProc("Update Gy_Warehouse set HSPGroupID=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    oCN.Commit();
                }
                objJsonResult.code = "0";
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -304,32 +304,59 @@
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HShortNumber;
                string HDeptNumber = list[0].HDeptNumber;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                bool HEndFlag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                var HQty = list[0].HQty;
                var HBarCodeForBase = list[0].HBarCodeForBase;
                var HDayMoney = list[0].HDayMoney;
                var HDeptID = list[0].HDeptID;
                var HProcID = list[0].HProcID;
                var HLevel = list[0].HLevel;
                var HWorkTimes = list[0].HWorkTimes;
                int HUSEORGID = list[0].HUSEORGID;
                string HMaker = msg2;
                //判断权限
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                //末级标志
                bool HEndFlag = true;
                //得到短代码
                string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
                if (HShortNumber.Trim() == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块!";
                    objJsonResult.data = null;
                    objJsonResult.Message = "保存失败!短代码为空!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //等级
                int HLevel = DBUtility.ClsPub.GetLevel(HNumber);
                //检查父级是否存在
                long HParentID = 0;
                string sParent = DBUtility.ClsPub.GetParentCode(HNumber);
                if (sParent.Trim() == "")
                {
                    HParentID = 0;
                }
                else
                {
                    ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_WorkCenter");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!上级代码不存在或被禁用!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
@@ -357,11 +384,12 @@
                   " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                   ",HDeptNumber,HWorkTimes,HQty" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
                   ",HProcID,HDayMoney,HUSEORGID) " +
                   ",HProcID,HDayMoney,HUSEORGID,HMaker,HMakeTime) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + "" +
                    ",'"+ HMaker + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -378,7 +406,10 @@
                                  ",HParentID=" + HParentID +
                                  ",HStopflag='" + HStopflag + "'" +
                                  ",HRemark= '" + HRemark + "'" +
                                  ",HUpDater= '" + HMaker + "'" +
                                  ",HUpDateDate= getdate()" +
                                  ",HDeptID=" + HDeptID +
                                  ",HLevel=" + HLevel +
                                  ",HQty=" + HQty +
                                  ",HWorkTimes=" + HWorkTimes +
                                  ",HBarCodeForBase='" + HBarCodeForBase + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -573,13 +573,13 @@
,HMaker,HMakeDate,HChecker,HCheckDate,HOWNERTYPEID,HOWNERID
,HERPInterID,HERPBillType,HPURCHASEORGID,HSTOCKORGID,HREQUIREORGID
,HSTOCKGROUPID,HSENDBILLNO,HLADBILLNO,HPURDEPTID,HPURGROUPID,HSUPPLYID
,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID)
,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID,HInnerBillNo)
values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1103 + "','" +
mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "'," + mainList[0].HBillStatus + "," + mainList[0].HSupID +
"," + mainList[0].HManagerID + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker +
"','" + mainList[0].HMakeDate + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HOWNERTYPEID + "'," + mainList[0].HOWNERID + "," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HSTOCKORGID + "," + mainList[0].HREQUIREORGID + "," +
mainList[0].HSTOCKGROUPID + ",'" + mainList[0].HSENDBILLNO + "','" + mainList[0].HLADBILLNO + "'," + mainList[0].HPURDEPTID + "," + mainList[0].HPURGROUPID + "," + mainList[0].HSUPPLYID + "," +
mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + ")";
mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + ",'" + mainList[0].HInnerBillNo + "'" + ")";
                oCN.RunProc(sql);
                //保存主表
                foreach (var oSub in subList)
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -141,62 +141,274 @@
        }
        #endregion
        #region å§”外工序发出单流水号回车获取条码信息2
        [Route("Cj_StationBill/txtHBarCode_KeyDown2")]
        [HttpGet]
        public object txtHBarCode_KeyDown2(string HBarCode,string HInterID,string UserID,string HBillType)
        {
            try
            {
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "空白码,条形码不能为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //拆分条形码
                string sBillBarCode = HBarCode.Trim();
                string[] NewBarCode;
                if (sBillBarCode.CompareTo("#") > 0)
                {
                    NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
                    sBillBarCode = NewBarCode[0];
                }
                string sBillNo = sBillBarCode;
                string[] arr = sBillNo.Split('&');
                string BillNo_PGD = arr[0];
                string entryid_PGD = "";
                if(arr.Length > 1)
                {
                    entryid_PGD = arr[1];
                }
                //截取条码类型
                string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
                //截取条码类型2
                string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
                //截取内码
                string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));
                switch (BillNoType2)
                {
                    case "GXLZ"://工序流转派工
                        ds = oCN.RunProcReturn("select * from h_v_Sc_ProcExchSendWorkBill  where æ´¾å·¥å•据号 = '" + BillNo_PGD + "'" + " and HEntryID ='" + entryid_PGD + "'", "h_v_Sc_ProcExchSendWorkBill");
                        break;
                    case "GXLX"://流转卡
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        break;
                }
                switch (BillNoType)
                //得到信息
                {
                    case "HCX"://生产资源码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList  where æ¡ç ç¼–号 = '" + BillNo + "'", "h_v_Gy_SourceList");
                        break;
                    case "SBM"://设备码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EquipMentList  where HItemID = '" + BillNo + "'", "h_v_Gy_EquipMentList");
                        break;
                    case "JYM"://员工码--检验员
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                        break;
                    case "GRM"://员工码--操作员,接收人
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                        break;
                    //case "CGM"://员工码
                    //    ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                    //    break;
                    case "HWH"://仓库码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_WareHouseList  where æ¡ç ç¼–号 = '" + HBarCode + "'", "h_v_Gy_WareHouseList");
                        break;
                    case "HSP"://仓位码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_StockPlaceList  where æ¡ç ç¼–号 = '" + HBarCode + "'", "h_v_Gy_StockPlaceList");
                        break;
                    case "WKM"://工作中心码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_WorkCenterList  where HItemID = '" + BillNo + "'", "h_v_Gy_WorkCenterList");
                        break;
                    case "BZM"://班组码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_GroupList  where æ¡ç ç¼–号 = '" + BillNo + "'", "h_v_Gy_GroupList");
                        break;
                    case "PRO"://工序码
                        string sReturn = "";
                        if (oSystemParameter.ShowBill(ref sReturn) == true)
                        {
                            if(HBillType == "In")
                            {
                                //系统参数是否为只显示当前登录用户关联的工序信息,N为否,Y为是
                                if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
                                {
                                    ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and ç”¨æˆ·ç¼–码 = '" + UserID + "'" + " order by åºå· asc", "h_v_Gy_ProcessList_GetProcNoByUser");
                                }
                                else
                                {
                                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNo  where HItemID = '" + BillNo + "' and HInterID = '" +
                                      HInterID + "'" + " order by åºå· asc", "h_v_Gy_ProcessList_GetProcNo");
                                }
                            }
                            else if(HBillType == "Out")
                            {
                                //系统参数是否为只显示当前登录用户关联的工序信息,N为否,Y为是
                                if (oSystemParameter.omodel.MES_StationOutBill_ShowUSERProcess == "Y")
                                {
                                    ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProcessList_GetProcNoByUser where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and ç”¨æˆ·ç¼–码 = '" + UserID + "'" + " order by åºå· asc", "h_v_Gy_ProcessList_GetProcNoByUser");
                                }
                                else
                                {
                                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNo  where HItemID = '" + BillNo + "' and HInterID = '" +
                                      HInterID + "'" + " order by åºå· asc", "h_v_Gy_ProcessList_GetProcNo");
                                }
                            }
                        }
                        break;
                    case "WLM"://物料码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList  where HItemID = '" + BillNo + "'", "h_v_Gy_MaterialList");
                        break;
                }
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到条码信息!";
                    objJsonResult.data = null;
                    if(BillNoType == "PRO")
                    {
                        ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList where HItemID = '" + BillNo + "'", "h_v_Gy_ProcessList");
                        if (ds == null || ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.Message = "未查询到条码信息!";
                        }
                        else
                        {
                            objJsonResult.Message = "用户未关联相关工序或流转卡无此工序,如有需要请维护";
                        }
                    }
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region æ ¹æ®ç™»å½•用户获取工序
        [Route("Sc_StationInBill/autoGetProcNo")]
        [HttpGet]
        public object autoGetProcNo(string HUserName,string HInterID)
        public object autoGetProcNo(string HUserID, string HInterID, string BillType)
        {
            string sReturn = "";
            if (oSystemParameter.ShowBill(ref sReturn) == true)
            {
                //系统参数是否为自动匹配流水号,N为手动输入,Y为自动匹配
                if (oSystemParameter.omodel.MES_StationBill_ProcNo == "Y")
                if(BillType == "In")//工序进站接收单
                {
                    try
                    //系统参数是否为自动匹配流水号,N为手动输入,Y为自动匹配
                    if (oSystemParameter.omodel.MES_StationInBill_AutoFindSNO == "Y")
                    {
                        if (HUserName == null || HUserName.Equals(""))
                        try
                        {
                            if (HUserID == null || HUserID.Equals(""))
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            //得到信息
                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_StationBill_autoGetProcNo  where HInterID = '" + HInterID + "' and ç”¨æˆ·ç¼–码 ='" + HUserID + "'" + " and ç´¯è®¡è¿›ç«™æ•°é‡ < è®¡åˆ’数量 and ä¸‹é“流转工序<>'转' and å§”外标记=0 order by åºå· asc", "h_v_Sc_StationBill_autoGetProcNo");
                            //写入信息
                            if (ds == null || ds.Tables[0].Rows.Count == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "未查询到工序信息!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            objJsonResult.code = "1";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "Sucess!";
                            objJsonResult.data = ds.Tables[0];
                            return objJsonResult;
                        }
                        catch (Exception e)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "用户名不能为空!";
                            objJsonResult.Message = "Exception!" + e.ToString();
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //得到信息
                        ds = oCN.RunProcReturn("select  * from h_v_Sc_StationBill_autoGetProcNo  where HInterID = '" + HInterID + "' and ç”¨æˆ·åç§° ='" + HUserName + "'", "h_v_Sc_StationBill_autoGetProcNo");
                        //写入信息
                        if (ds == null || ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "未查询到工序信息!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess!";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    catch (Exception e)
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "Exception!" + e.ToString();
                        objJsonResult.data = null;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
                }
                else if(BillType == "Out")//工序出站汇报单
                {
                    //系统参数是否为自动匹配流水号,N为手动输入,Y为自动匹配
                    if (oSystemParameter.omodel.MES_StationOutBill_AutoFindSNO == "Y")
                    {
                        try
                        {
                            if (HUserID == null || HUserID.Equals(""))
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            //得到信息
                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_StationBill_autoGetProcNo  where HInterID = '" + HInterID + "' and ç”¨æˆ·ç¼–码 ='" + HUserID + "'" + " and ç´¯è®¡å‡ºç«™æ•°é‡ < è®¡åˆ’数量 and ä¸‹é“流转工序<>'转' and å§”外标记=0 order by åºå· asc", "h_v_Sc_StationBill_autoGetProcNo");
                            //写入信息
                            if (ds == null || ds.Tables[0].Rows.Count == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "未查询到工序信息!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            objJsonResult.code = "1";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "Sucess!";
                            objJsonResult.data = ds.Tables[0];
                            return objJsonResult;
                        }
                        catch (Exception e)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "Exception!" + e.ToString();
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "手动输入模式";
                    objJsonResult.data = "";
                    return objJsonResult;
                    return 0;
                }
            }
            else
            {
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -95,7 +95,7 @@
                long HInterID = list[0].HInterID;//递入type得到的单据ID
                string HBillNo = list[0].HBillNo;//递入type得到的单据号
                int HBillStatus = 0;
                string HMaker = list[0].HMaker;//制单人
                string HMaker = user;//制单人
                int HYear = 2021;
                double HPeriod = 1;
                string HRemark = list[0].HRemark;//备注
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -59,7 +60,7 @@
                long HInterID = list[0].HInterID;//递入type得到的单据ID
                string HBillNo = list[0].HBillNo;//递入type得到的单据号
                int HBillStatus = 0;
                string HMaker = list[0].HMaker;//制单人
                string HMaker = user;//制单人
                string HMouldNum = list[0].HMouldNum;//模穴号
                int HYear = 2021;
                double HPeriod = 1;
@@ -199,14 +200,14 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (HCenterID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工作中心没有选择!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HCenterID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "工作中心没有选择!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (HQty + HWasterQty <= 0)
                {
                    objJsonResult.code = "0";
@@ -370,14 +371,53 @@
                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 (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc == false)
                //判断是否是新增
                if ("Add".Equals(eventType))
                {
                    //判断是否是末道工序
                    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;
                                }
                            }
                        }
                    }
                }
                else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "是")
                {
                }
                oCN.Commit();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
@@ -408,7 +448,428 @@
            }
        }
        #region æœ«é“工序 ç”Ÿäº§æ±‡æŠ¥
        public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
        {
            try
            {
                //获取生产汇报单最大InterID和单据号
                Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
                //获取组织代码
                string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
                //根据工序汇报单主ID获取工序汇报入库单的数据
                DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
                if (ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生成生产汇报单过程中没有查询到出站单";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataRow dr = ds.Tables[0].Rows[0];
                //保存
                //oCN.BeginTran();
                DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
                if (DsTable.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "已入库,请不要重复入库";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //生产汇报单主表
                oCN.RunProc("Insert Into Sc_ICMOReportBillMain   " +
            "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
            ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
            ",HGroupID,HDeptID,HDeptNumber" +
            ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
            ") " +
            " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
            ",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["操作员代码"].ToString() +
            "','" + dr["HGroupID"].ToString() + "',0,''" +
            ",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
            ") ");
                //生产汇报单子表
                oCN.RunProc("Insert into Sc_ICMOReportBillSub " +
                      " (HInterID,HEntryID,HMaterID,HMaterNumber" +
                      ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
                      ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
                      "HCloseMan,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                      ",HICMOInterID,HICMOBillNo,HBarCode" +
                      ") values("
                      + HInterID.ToString() + ",1," + dr["HMaterID"].ToString() + ",'" + dr["产品代码"].ToString() + "'" +
                      "," + dr["合格数量"].ToString() + ",0,'',0,0" +
                      "," + dr["接收数量"].ToString() + "," + dr["HEmpID"].ToString() + ",'" + dr["操作员代码"].ToString() + "'," + dr["不良数量"].ToString() + "," + dr["报废数量"].ToString() +
                      ",'',0,''" +
                      "," + InterID.ToString() + ",0,'" + BillNo.ToString() + "','3791',0,0" +
                      ",0,0,''" +
                      "," + dr["HICMOInterID"].ToString() + ",'" + dr["任务单"].ToString() + "',''" +
                      ") ");
                //同步金蝶
                //访问金蝶
                var loginRet = InvokeHelper.Login();
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //根据任务单查找到金蝶的生产订单
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataRow dr1 = ds1.Tables[0].Rows[0];
                JObject model = new JObject();
                model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //单据类型生产汇报“SCHBD02_SYS” å…¥åº“汇报SCHBD01_SYS
                model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
                model.Add("FHZYMESFLAG", "是");//  æ˜¯å¦ä¸ºMES同步
                model.Add("FBillNo", HBillNo);
                JArray Fentity = new JArray();
                foreach (DataRow item in ds.Tables[0].Rows)
                {
                    JObject FentityModel = new JObject();
                    FentityModel.Add("FIsNew", false);//  æºå•类型
                    FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = dr1["FREPORTTYPENUMBER"].ToString() });//生产汇报类型
                    FentityModel.Add("FSrcBillType", "PRD_MO");//  æºå•类型
                    FentityModel.Add("FProductType", "1");//  äº§å“ç±»åž‹
                    FentityModel.Add("FSrcBillNo", item["任务单"].ToString());//  æºå•编号
                    FentityModel.Add("FSrcInterId", dr1["FMOID"].ToString());//  æºå•内码
                    FentityModel.Add("FSrcEntryId", dr1["FMOENTRYID"].ToString());//  æºå•分录内码、
                    FentityModel.Add("FSRCENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());//  æºå•分录行号
                    FentityModel.Add("FUNITID", new JObject() { ["Fnumber"] = dr1["FUNITNUMBER"].ToString() });//单位
                    FentityModel.Add("FTimeUnitId", "1");//时间单位
                    FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); //  ç”Ÿäº§è½¦é—´
                    FentityModel.Add("FStandHourUnitId", "3600"); // å•位标准工时单位
                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // ç‰©æ–™ç¼–码
                    FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//生产订单行号
                    FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1
                    FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty
                    FentityModel.Add("FFailQty", item["不良数量"].ToString());//不合格数量
                    FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// å…¥åº“组织
                    FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // ä»“库
                    FentityModel.Add("FMOID", dr1["FMOID"].ToString());//
                    FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());//
                    FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
                    FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());//
                    FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //货主类型:FOwnerTypeId(必填项)
                    FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //货主:FOwnerId(必填项)
                    FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM版本:FBomId(必填项)
                    FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// æˆæœ¬æƒé‡
                    FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// å€’冲领料
                    FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
                    //FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //包装标识
                    FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //批号
                    FentityModel.Add("F_bsv_Text", dr1["工序流转卡号"].ToString()); //流转卡号
                    JArray Fentity2 = new JArray();
                    JObject FentityModel2 = new JObject();
                    FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
                    FentityModel2.Add("FEntity_Link_FFlowLineId", "PRD_MO2MORPT");
                    FentityModel2.Add("FEntity_Link_FRuleId", "3");
                    FentityModel2.Add("FEntity_Link_FSTableId", "0");
                    FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MOENTRY");
                    FentityModel2.Add("FEntity_Link_FSBillId", dr1["FMOID"].ToString());
                    FentityModel2.Add("FEntity_Link_FSId", dr1["FMOENTRYID"].ToString());
                    FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["合格数量"].ToString());
                    FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["合格数量"].ToString());
                    Fentity2.Add(FentityModel2);
                    FentityModel.Add("FEntity_Link", Fentity2);
                    FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
                    Fentity.Add(FentityModel);
                }
                model.Add("FEntity", Fentity); //明细信息
                JObject jsonRoot = new JObject()
                {
                    ["Creator"] = "",
                    ["NeedUpDateFields"] = new JArray(),
                    ["NeedReturnFields"] = new JArray(),
                    ["IsDeleteEntry"] = "false",
                    ["SubSystemId"] = "",
                    ["IsVerifyBaseDataField"] = "false",
                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                    ["Model"] = model
                };
                string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存
                //判断保存是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("工序汇报单入库错误jsonRoot:" + jsonRoot);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"工序汇报入库单同步金蝶云失败!单号:{dr["单据号"].ToString()}" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //提交审核
                string result1 = string.Empty;
                string result2 = string.Empty;
                var fID = JObject.Parse(result)["Result"]["Id"].ToString();
                var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                var json = new
                {
                    Ids = fID,
                };
                result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"生产汇报单单号:{fBillNo},提交失败" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");
                //oCN.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                objJsonResult.data = 1;
                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 SaveProcdutInBill(string BillNo)
        {
            try
            {
                //获取生产汇报单最大InterID和单据号
                Int64 HInterID = DBUtility.ClsPub.CreateBillID("1202", ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillNo = DBUtility.ClsPub.CreateBillCode("1202", ref DBUtility.ClsPub.sExeReturnInfo, true);
                ////判断入库的合格数量是否为0
                //var DTable = oCN.RunProcReturn("select * from  Sc_StationOutBillMain where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
                //if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
                //{
                //    objJsonResult.code = "1";
                //    objJsonResult.count = 2;
                //    objJsonResult.Message = "合格数量为0,不需要入库!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //保存
                //oCN.BeginTran();
                //同步金蝶
                //访问金蝶
                var loginRet = InvokeHelper.Login();
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc_Mes '" + BillNo + "'", "h_p_TOERPProcduct_LastProc_Mes");
                DataRow dr1 = ds1.Tables[0].Rows[0];
                if (double.Parse(dr1[0].ToString()) <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到对应的生产汇报单记录;1.未查询到对应的生产汇报单;2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                JObject model = new JObject();
                model.Add("FBillType", new JObject() { ["FNumber"] = "SCRKD01_SYS" }); //单据类型
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期
                model.Add("FStockOrgId", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //库存组织代码
                model.Add("FPrdOrgId", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //生产组织代码
                model.Add("FOwnerTypeId0", "BD_OwnerOrg");
                model.Add("FOwnerId0", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //
                model.Add("FIsEntrust", "false");//
                model.Add("FCurrId", new JObject() { ["FNumber"] = "PRE001" }); //
                model.Add("FBillNo", BillNo);
                JArray Fentity = new JArray();
                foreach (DataRow item in ds1.Tables[0].Rows)
                {
                    JObject FentityModel = new JObject();
                    FentityModel.Add("FSrcEntryId", item["HSourceEntryID"].ToString());//  æºå•分录内码、
                    FentityModel.Add("FIsNew", "false");//  æºå•类型
                    FentityModel.Add("FMaterialId", new JObject() { ["FNumber"] = item["HMaterNumber"].ToString() }); // ç‰©æ–™ç¼–码
                    FentityModel.Add("FCheckProduct", "false");//
                    FentityModel.Add("FInStockType", "1");//
                    FentityModel.Add("FProductType", "1");//
                    FentityModel.Add("FUNITID", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//单位
                    FentityModel.Add("FMustQty", item["数量"].ToString());//
                    FentityModel.Add("FRealQty", item["数量"].ToString());//
                    FentityModel.Add("FCostRate", "100");//
                    FentityModel.Add("FBaseUnitId", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//单位
                    FentityModel.Add("FBaseMustQty", item["数量"].ToString());//
                    FentityModel.Add("FBaseRealQty", item["数量"].ToString());//
                    FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
                    FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
                    FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // ä»“库
                    FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //批号
                    FentityModel.Add("FISBACKFLUSH", "true");//
                    FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); //  ç”Ÿäº§è½¦é—´
                    FentityModel.Add("FMOBILLNO", item["HMOBillNo"].ToString());//
                    FentityModel.Add("FMoId", item["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FMoEntryId", item["HMOEntryID"].ToString());//
                    FentityModel.Add("FMoEntrySeq", item["HMOEntrySEQ"].ToString());//生产订单行号
                    FentityModel.Add("FStockUnitId", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//库存单位
                    FentityModel.Add("FStockRealQty", item["数量"].ToString());//
                    FentityModel.Add("FSrcBillType", "PRD_MORPT");//
                    FentityModel.Add("FSrcBillNo", item["HSourceBillNo"].ToString());//
                    FentityModel.Add("FSrcInterId", item["HSourceInterID"].ToString());//
                    FentityModel.Add("FBasePrdRealQty", item["数量"].ToString());//
                    FentityModel.Add("FIsFinished", "false");//
                    FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT01_SYS" }); //
                    FentityModel.Add("FSrcEntrySeq", item["HSourceSeQ"].ToString());//  æºå•分录行号
                    FentityModel.Add("FMOMAINENTRYID", item["HMOEntryID"].ToString());//
                    FentityModel.Add("FKeeperTypeId", "BD_KeeperOrg");
                    FentityModel.Add("FKeeperId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
                    FentityModel.Add("FIsOverLegalOrg", "false");//
                    FentityModel.Add("F_bsv_Base1", new JObject() { ["FNumber"] = item["HBZBS"].ToString() });//
                    FentityModel.Add("F_BSV_TEXT", item["HLZKH"].ToString());//
                    FentityModel.Add("F_BSV_TEXT1", item["HWYID"].ToString());//
                                                                              //批号
                                                                              //FFLOWID FFLOWLINEID FRULEID FSTABLENAME
                                                                              //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72    3   PRD_MO2MORPT T_PRD_MOENTRY
                                                                              //业务流程图:FEntity_Link_FFlowId
                                                                              //推进路线:FEntity_Link_FFlowLineId
                                                                              //转换规则:FEntity_Link_FRuleId
                                                                              //源单表内码:FEntity_Link_FSTableId
                                                                              //源单表:FEntity_Link_FSTableName
                                                                              //源单内码:FEntity_Link_FSBillId
                                                                              //源单分录内码:FEntity_Link_FSId
                                                                              //原始携带量:FEntity_Link_FBaseQuaQtyOld
                                                                              //修改携带量:FEntity_Link_FBaseQuaQty
                    JArray Fentity2 = new JArray();
                    JObject FentityModel2 = new JObject();
                    FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
                    FentityModel2.Add("FEntity_Link_FFlowLineId", "5");
                    FentityModel2.Add("FEntity_Link_FRuleId", "PRD_MORPT2INSTOCK");
                    FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MORPTENTRY");
                    FentityModel2.Add("FEntity_Link_FSTableId", "0");
                    FentityModel2.Add("FEntity_Link_FSBillId", item["HSourceInterID"].ToString());
                    FentityModel2.Add("FEntity_Link_FSId", item["HSourceEntryID"].ToString());
                    FentityModel2.Add("FEntity_Link_FBasePrdRealQtyOld", item["关联数量"].ToString());
                    FentityModel2.Add("FEntity_Link_FBasePrdRealQty", item["数量"].ToString());
                    Fentity2.Add(FentityModel2);
                    FentityModel.Add("FEntity_Link", Fentity2);
                    FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
                    Fentity.Add(FentityModel);
                    //Fentity.Add(FentityModel);
                }
                model.Add("FEntity", Fentity); //明细信息
                JObject jsonRoot = new JObject()
                {
                    ["Creator"] = "",
                    ["NeedUpDateFields"] = new JArray(),
                    ["NeedReturnFields"] = new JArray(),
                    //["IsDeleteEntry"] = "true",
                    //["SubSystemId"] = "",
                    //["IsVerifyBaseDataField"] = "false",
                    ["IsDeleteEntry"] = "true",
                    ["SubSystemId"] = "",
                    ["IsVerifyBaseDataField"] = "true",
                    ["IsEntryBatchFill"] = "false",
                    ["ValidateFlag"] = "true",
                    ["NumberSearch"] = "true",
                    ["IsAutoAdjustField"] = "false",
                    ["InterationFlags"] = "",
                    ["IgnoreInterationFlag"] = "",
                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                    ["Model"] = model
                };
                string result = InvokeHelper.Save("PRD_INSTOCK", JsonConvert.SerializeObject(jsonRoot));//保存
                //判断保存是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("生产入库错误jsonRoot:" + jsonRoot);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"生产入库单同步金蝶云失败!单号:{HBillNo.ToString()}" + result + jsonRoot;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //提交审核
                string result1 = string.Empty;
                string result2 = string.Empty;
                var fID = JObject.Parse(result)["Result"]["Id"].ToString();
                var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                var json = new
                {
                    Ids = fID,
                };
                result1 = InvokeHelper.Submit("PRD_INSTOCK", JsonConvert.SerializeObject(json));//提交
                //result2 = InvokeHelper.Audit("PRD_INSTOCK", JsonConvert.SerializeObject(json));//提交
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"生产入库单单号:{fBillNo},提交失败" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");
                //oCN.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
@@ -1639,7 +2100,141 @@
        }
        #endregion
        #region è¿”回工序出站汇报单明细列表
        [Route("Cj_StationOutBill_Detail/get_Display2")]
        [HttpGet]
        public object get_Display2(string HMaterID, string HWorkProcID, string HProcExchBillNo)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where å·¥åºID = " + HWorkProcID + " and ç‰©æ–™ID = " + HMaterID + " and æµè½¬å¡å· = '" + HProcExchBillNo + "'" , "h_v_GetStationOutBill_Detail");
                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("Cj_StationOutBill/AddBill_Detail")]
        [HttpPost]
        public object AddBill_Detail([FromBody] JObject sMain)
        {
            try
            {
                var _value = sMain["sMainSub"].ToString();
                string msg1 = _value.ToString();
                oCN.BeginTran();
                //保存主表
                objJsonResult = Add_Detail(msg1);
                if (objJsonResult.code == "0")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        public json Add_Detail(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString(); //表头数据
            string msg3 = sArray[1].ToString(); //表体数据
            var a = sArray[2].ToString();
            int OperationType = int.Parse(sArray[2].ToString()); // æ•°æ®ç±»åž‹ 1添加 3修改
            string user = sArray[3].ToString(); //用户名
            try
            {
                msg2 = "[" + msg2.ToString() + "]";
                List<ClsSc_StationOutBillSub_Emp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg2);
                List<ClsSc_StationOutBillSub_Emp> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg3);
                long HInterID = mainList[0].HInterID;
                long HWorkEmpID = subList[0].HWorkEmpID;
                long HWorkSourceID = subList[0].HWorkSourceID;
                decimal HQty = subList[0].HQty;
                decimal HRate = subList[0].HRate;
                decimal HProcPrice = subList[0].HProcPrice;
                decimal HMoney = subList[0].HMoney;
                long HWorkProcID = mainList[0].HWorkProcID;
                var EntryID = 0;
                foreach (ClsSc_StationOutBillSub_Emp oSub in subList)
                {
                    //ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and å•据号='" + HBillNo + "'", "h_v_IF_ICMOBillList");
                    if ((OperationType == 1 || OperationType == 2))//新增 && ds.Tables[0].Rows.Count == 0
                    {
                        EntryID++;
                        string sql = string.Empty;
                        sql = $@"
                        Insert into Sc_StationOutBillSub_Emp
                        (HInterID,HEntryID,HBillNo_bak ,HRemark ,HSourceInterID
                        ,HSourceEntryID ,HSourceBillNo ,HSourceBillType ,HRelationQty ,HRelationMoney
                        ,HWorkEmpID ,HWorkSourceID ,HQty ,HRate ,HProcPrice ,HMoney ,HWorkProcID)
                        values(" + HInterID + "," + EntryID + "," + "'" + mainList[0].HBillNo_bak + "','" + mainList[0].HRemark + "'," + 0 + "," + 0 + ",'" + " " + "','" + " " + "'," +
                        "0" + "," + 0 + "," + oSub.HWorkEmpID + "," + oSub.HWorkSourceID + "," + oSub.HQty + "," + oSub.HRate + "," + oSub.HProcPrice + "," + oSub.HMoney + "," + HWorkProcID + ")";
                        oCN.RunProc(sql);
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = null;
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Sc_ProcExchRecordBackBillController.cs
New file
@@ -0,0 +1,432 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.CJGL
{
    public class Sc_ProcExchRecordBackBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        #region å·¥åºè¿”工记录单列表
        [Route("Sc_ProcExchRecordBackBill/Sc_ProcExchRecordBackBillList")]
        [HttpGet]
        public object Sc_ProcExchRecordBackBillList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchRecordBackBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = "select * from h_v_Sc_ProcExchRecordBackBillList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcExchRecordBackBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.list = columnNameList;
                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("Sc_ProcExchRecordBackBill/GetProcessExchangeBillSub")]
        [HttpGet]
        public object GetProcessExchangeBillSub_cf(string sWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select top 2 * from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql + sWhere+ " order by æµæ°´å· ", "h_v_Sc_ProcessExchangeBillQuerySub");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region å·¥åºè¿”工记录单  æ–°å¢ž/编辑
        /// <summary>
        /// æ–°å¢žå•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Sc_ProcExchRecordBackBill/Sc_ProcExchRecordBackBillAddBill")]
        [HttpPost]
        public object Sc_ProcExchRecordBackBillAddBill([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();//主表
            string msg3 = sArray[1].ToString();//子表
            int msg5 = int.Parse(sArray[2].ToString());//类型
            string msg6 = sArray[3].ToString();//用户
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg6))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //主表
                DAL.ClsSc_ProcExchRecordBackBill oBill = new DAL.ClsSc_ProcExchRecordBackBill();
                List<Model.ClsSc_ProcExchRecordBackBillMain> lsmain = new List<Model.ClsSc_ProcExchRecordBackBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_ClsSc_ProcExchRecordBackBillMain(msg2);
                foreach (Model.ClsSc_ProcExchRecordBackBillMain oItem in lsmain)
                {
                    oItem.HBillType = "3797";
                    oItem.HBillSubType = "3797";
                    oItem.HBillStatus = 1;
                    oItem.HMaker = msg6;
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HChecker != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!单据已审核,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                List<Model.ClsSc_ProcExchRecordBackBillSub> ls = new List<Model.ClsSc_ProcExchRecordBackBillSub>();
                ls = oListModels.getObjectByJson_ClsSc_ProcExchRecordBackBillSub(msg3);
                int i = 0;
                foreach (Model.ClsSc_ProcExchRecordBackBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    oItemSub.HSourceInterID = 0;     // æºå•主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    oItemSub.HRelationQty = 0;     //关联数量
                    oItemSub.HBillNo_bak = oBill.omodel.HBillNo;     //备份单据号
                    oItemSub.HCloseMan = "";
                    oItemSub.HSourceBillNo = "";
                    oItemSub.HSourceBillType = "";
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (msg5 == 1)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region å·¥åºè¿”工记录单 åˆ é™¤
        /// <summary>
        /// å·¥åºè¿”工记录单
        /// </summary>
        /// <returns></returns>
        [Route("Sc_ProcExchRecordBackBill/DelProcExchWorkBackBill")]
        [HttpGet]
        public object DelProcExchWorkBackBill(string HInterID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchRecordBackBill_Drop", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            DAL.ClsSc_ProcExchRecordBackBill oBill = new DAL.ClsSc_ProcExchRecordBackBill();
            ds = oCN.RunProcReturn("select * from Sc_ProcExchRecordBackBillMain where HInterID=" + lngBillKey, "Sc_ProcExchRecordBackBillMain");
            if (ds.Tables[0].Rows.Count > 0)
            {
                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据当前处于不能删除状态,不能删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已经审核,不能删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据未找到";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å·¥åºè¿”工记录单 å®¡æ ¸/反审核
        [Route("Sc_ProcExchRecordBackBill/set_CheckBill")]
        [HttpGet]
        public object set_CheckBill(int HInterID, int num, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchRecordBackBill_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HInterID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据ID为0,不能审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataSet Ds = oCN.RunProcReturn("Select * from Sc_ProcExchRecordBackBillMain Where HInterID=" + HInterID, "Sc_ProcExchRecordBackBillMain");
                if (Ds.Tables[0].Rows.Count > 0)
                {
                    if (num == 1)
                    {
                        //查看是否已审核,关闭,作废
                        if (Ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (num == 2)
                    {
                        if (Ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!请先审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    //审核
                    if (Cj_StationInBillCheckBill(HInterID, num, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据未找到!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //审核
        public bool Cj_StationInBillCheckBill(Int64 HInterID, int num, string CurUserName, ref string sReturn)
        {
            try
            {
                oCN.BeginTran();
                if (num == 1)
                {
                    oCN.RunProc(" Update Sc_ProcExchRecordBackBillMain set HChecker='" + CurUserName + "',HBillStatus=2,HCheckDate=getdate() Where HInterID=" + HInterID.ToString());
                }
                if (num == 2)
                {
                    oCN.RunProc(" Update Sc_ProcExchRecordBackBillMain set HChecker='',HBillStatus=1,HCheckDate=null Where HInterID=" + HInterID.ToString());
                }
                oCN.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCN.RollBack();
                return false; ;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs
New file
@@ -0,0 +1,270 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.CJGL
{
    public class Sc_ProcExchSendWorkBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        #region å·¥åºæ´¾å·¥å•列表
        [Route("Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList")]
        [HttpGet]
        public object Sc_ProcExchSendWorkBillList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_Sc_ProcExchSendWorkBillList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcExchSendWorkBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.list = columnNameList;
                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("Sc_ProcExchSendWorkBill/GetProcessExchangeBillSub")]
        [HttpGet]
        public object GetProcessExchangeBillSub_cf(string sWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select * from h_v_Sc_ProcessExchangeBillQuerySub_SendWork");
                ds = oCN.RunProcReturn(sql + sWhere + " order by æµæ°´å· ", "h_v_Sc_ProcessExchangeBillQuerySub_SendWork");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region å·¥åºæ´¾å·¥å• ä¿å­˜/编辑
        /// <summary>
        /// å·¥åºæ´¾å·¥å• ä¿å­˜
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_ProcExchSendWorkBill/SaveProcessSendWork")]
        [HttpPost]
        public object SaveProcessSendWork([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                DAL.ClsSc_ProcExchSendWorkBill oBill = new DAL.ClsSc_ProcExchSendWorkBill();
                List<Model.ClsSc_ProcExchSendWorkBillMain> lsmain = new List<Model.ClsSc_ProcExchSendWorkBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_ClsSc_ProcExchSendWorkBillMain(msg2);
                foreach (Model.ClsSc_ProcExchSendWorkBillMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3798";
                    oItem.HBillSubType = "3798";
                    oItem.HBillStatus = 1;
                    DBUtility.ClsPub.CurUserName = UserName;
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_ProcExchSendWorkBillSub> ls = new List<Model.ClsSc_ProcExchSendWorkBillSub>();
                ls = oListModels.getObjectByJson_ClsSc_ProcExchSendWorkBillSub(msg3);
                int i = 0;
                foreach (Model.ClsSc_ProcExchSendWorkBillSub oItemSub in ls)
                {
                    i++;
                    oItemSub.HEntryID = i;
                    //oItemSub.HCloseMan = "";       //行关闭
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    //oItemSub.HRemark = "";         //备注
                    oItemSub.HSourceInterID = 0;     // æºå•主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    //oItemSub.HSourceBillNo = "";  //源单单号
                    //oItemSub.HSourceBillType = ""; //源单类型
                    oItemSub.HRelationQty = 0;     //关联数量
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        //#region å·¥åºæ´¾å·¥å• åˆ é™¤
        [Route("Sc_ProcExchSendWorkBill/DelProcessSendWork")]
        [HttpGet]
        public object DelProcessSendWork(string HInterID, string user)
        {
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            DAL.ClsSc_ProcExchSendWorkBill oBill = new DAL.ClsSc_ProcExchSendWorkBill();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                ds = oCN.RunProcReturn("select * from Sc_ProcExchSendWorkBillMain where HInterID=" + lngBillKey, "Sc_ProcExchSendWorkBillMain");
                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据当前处于不能删除状态,不能删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已经审核,不能删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据未找到";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //#endregion
    }
}
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
@@ -77,7 +77,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select top 2 * from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql + sWhere + " order by æµæ°´å· ", "h_v_Sc_ProcessExchangeBillQuerySub");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -50,7 +50,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DBUtility.ClsPub.CurUserName = msg4;
                DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
                List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -61,8 +61,8 @@
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3772";
                    oItem.HBillSubType = "3772";
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
@@ -445,6 +445,9 @@
                {
                    Main.HBillNo = ListHbillNo[i].HBillNo;
                    Main.HQty = ListHbillNo[i].HQty;
                    Main.HSplitNo = ListHbillNo[i].HSplitNo;
                    Main.HAuxQty = 0;
                    Main.HAuxUnit = 0;
                    oBill.omodel = Main;
                    int j = 0;
@@ -666,12 +669,12 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select æµæ°´å· HProcNo,HProcID,工序代码 HProcNumber,工序名称 HProcName,加工说明 HWorkRemark,HCenterID,工作中心代码 HCenterNumber,
                                                å·¥ä½œä¸­å¿ƒ HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust,计划数量 HQty,加工单价 HOutPrice, è¡¨ä½“备注 HRemark,
                                                å·¥ä½œä¸­å¿ƒ HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust HSupFlag,计划数量 HQty,加工单价 HOutPrice, è¡¨ä½“备注 HRemark,
                                            è¿›ç«™å…³è”数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            è‰¯çއ HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
                                            åŠ å·¥è½¦é—´ä»£ç  HDeptNumber,加工车间 HDeptName
                                            from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + "  order by cast(流水号 as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
@@ -933,6 +936,7 @@
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();
            string linterid = sArray[4].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
@@ -953,16 +957,11 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Sc_ProcessExchangeBillMain(msg2);
                string sReturn = "";
                DBUtility.ClsPub.HOrgID = lsmain[0].HPRDORGID;
                oBill.ShowBill(long.Parse(linterid), ref sReturn);
                foreach (Model.ClsSc_ProcessExchangeBillMain oItem in lsmain)
                {
                    oItem.HMaker = msg5;  //制单人
                    oItem.HBillType = "3772";
                    oBill.HBillSubType = "Split";
                    oItem.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMaterID2 = oItem.HMaterID;
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
@@ -971,7 +970,16 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                    oBill.omodel.HMaker = msg5;  //制单人
                    oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
                    oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oBill.omodel.HDate = oItem.HDate;// æ—¥æœŸ
                    oBill.omodel.HPlanBeginDate = oItem.HPlanBeginDate;// è®¡åˆ’开工日期
                    oBill.omodel.HPlanEndDate = oItem.HPlanEndDate;// è®¡åˆ’完工日期
                    oBill.omodel.HQty = oItem.HQty;// æ•°é‡
                    oBill.omodel.HBillNo = oItem.HBillNo;// å•据号
                }
                //表体数据
@@ -986,19 +994,19 @@
                foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
                {
                    i++;
                    if (oItemSub.HSplitQty > oItemSub.HLeftQty)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第"+i+ "行,拆分数量不能大于可拆分数量!";
                        objJsonResult.Message = "第" + (i + 1) + "行,拆分数量不能大于可拆分数量!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oBill.DetailColl.Add(oItemSub);
                    oBill.DetailColl[i].HQty = oItemSub.HQty;
                    oBill.DetailColl[i].HBackProc = oItemSub.HBackProc;
                    oBill.DetailColl[i].HPrevSourceInterID = oItemSub.HPrevSourceInterID;
                    oBill.DetailColl[i].HPrevSourceEntryID = oItemSub.HPrevSourceEntryID;
                    i++;
                }
                //保存
WebAPI/Controllers/CJGL/Sc_ProcessSendWorkController.cs
New file
@@ -0,0 +1,253 @@
//using Newtonsoft.Json;
//using Newtonsoft.Json.Linq;
//using Pub_Class;
//using System;
//using System.Collections;
//using System.Collections.Generic;
//using System.Data;
//using System.Data.SqlClient;
//using System.Web.Http;
//using WebAPI.Models;
//namespace WebAPI.Controllers
//{
//    public class Sc_ProcessSendWorkController : ApiController
//    {
//        private json objJsonResult = new json();
//        public DataSet ds = new DataSet();
//        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//        #region å·¥åºæ´¾å·¥å• åˆ—表
//        /// <summary>
//        /// å·¥åºæ´¾å·¥å•列表
//        /// </summary>
//        /// <returns></returns>
//        [Route("Sc_ProcessSendWork/Sc_ProcessSendWorkList")]
//        [HttpGet]
//        public object Sc_ProcessSendWorkList(string sWhere, string user)
//        {
//            try
//            {
//                List<object> columnNameList = new List<object>();
//                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessSendWorkList where 1=1 " + sWhere, "h_v_Sc_ProcessSendWorkList");
//                //添加列名
//                foreach (DataColumn col in ds.Tables[0].Columns)
//                {
//                    Type dataType = col.DataType;
//                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
//                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
//                }
//                objJsonResult.code = "1";
//                objJsonResult.count = 1;
//                objJsonResult.Message = "返回记录成功!";
//                objJsonResult.data = ds.Tables[0];
//                objJsonResult.list = columnNameList;
//                return objJsonResult;
//            }
//            catch (Exception ex)
//            {
//                objJsonResult.code = "0";
//                objJsonResult.count = 0;
//                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
//                objJsonResult.data = null;
//                return objJsonResult;
//            }
//        }
//        #endregion
//        #region å·¥åºæ´¾å·¥å• ä¿å­˜/编辑
//        /// <summary>
//        /// å·¥åºæ´¾å·¥å• ä¿å­˜
//        /// </summary>
//        /// <param name="msg"></param>
//        /// <returns></returns>
//        [Route("Sc_ProcessSendWork/SaveProcessSendWork")]
//        [HttpPost]
//        public object SaveProcessSendWork([FromBody] JObject msg)
//        {
//            var _value = msg["msg"].ToString();
//            string msg1 = _value.ToString();
//            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
//            string msg2 = sArray[0].ToString();
//            string msg3 = sArray[1].ToString();
//            string msg4 = sArray[2].ToString();
//            string UserName = "";
//            ListModels oListModels = new ListModels();
//            try
//            {
//                DAL.ClsSc_ProcessSendWork oBill = new DAL.ClsSc_ProcessSendWork();
//                List<Model.ClsSc_ProcessSendWorkMain> lsmain = new List<Model.ClsSc_ProcessSendWorkMain>();
//                msg2 = msg2.Replace("\\", "");
//                msg2 = msg2.Replace("\n", "");  //\n
//                lsmain = oListModels.getObjectByJson_ClsSc_ProcessSendWorkMain(msg2);
//                foreach (Model.ClsSc_ProcessSendWorkMain oItem in lsmain)
//                {
//                    //oItem.HMaker = "";
//                    UserName = oItem.HMaker;  //制单人
//                    oItem.HBillType = "3712";
//                    oItem.HBillSubType = "3712";
//                    oItem.HBillStatus = 1;
//                    DBUtility.ClsPub.CurUserName = UserName;
//                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
//                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
//                    {
//                        objJsonResult.code = "0";
//                        objJsonResult.count = 0;
//                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
//                        objJsonResult.data = 1;
//                        return objJsonResult;
//                    }
//                    oBill.omodel = oItem;
//                }
//                //表体数据
//                //按 },{来拆分数组 //去掉【和】
//                msg3 = msg3.Substring(1, msg3.Length - 2);
//                msg3 = msg3.Replace("\\", "");
//                msg3 = msg3.Replace("\n", "");  //\n
//                //msg2 = msg2.Replace("'", "’");
//                List<Model.ClsSc_ProcessSendWorkSub> ls = new List<Model.ClsSc_ProcessSendWorkSub>();
//                ls = oListModels.getObjectByJson_ClsSc_ProcessSendWorkSub(msg3);
//                int i = 0;
//                foreach (Model.ClsSc_ProcessSendWorkSub oItemSub in ls)
//                {
//                    i++;
//                    oItemSub.HEntryID = i;
//                    //oItemSub.HCloseMan = "";       //行关闭
//                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
//                    oItemSub.HCloseType = false;   //关闭类型
//                    //oItemSub.HRemark = "";         //备注
//                    oItemSub.HSourceInterID = 0;     // æºå•主内码
//                    oItemSub.HSourceEntryID = 0;   //源单子内码
//                    //oItemSub.HSourceBillNo = "";  //源单单号
//                    //oItemSub.HSourceBillType = ""; //源单类型
//                    oItemSub.HRelationQty = 0;     //关联数量
//                                                   //oItemSub.HRelationMoney = 0;   //关联金额
//                                                   //HMaterID = "";//配件代码
//                                                   //HUnitID = "";//单位代码
//                                                   //HQty = "";//实际用量
//                                                   //HQtyMust = "";//单位用量
//                                                   //HRemark = "";//备注
//                    oBill.DetailColl.Add(oItemSub);
//                }
//                //保存
//                //保存完毕后处理
//                bool bResult;
//                if (oBill.omodel.HInterID == 0)
//                {
//                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
//                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
//                }
//                else
//                {
//                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//                }
//                if (bResult)
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 1;
//                    objJsonResult.Message = "保存成功!";
//                    objJsonResult.data = 1;
//                    return objJsonResult;
//                }
//                else
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
//                    objJsonResult.data = 1;
//                    return objJsonResult;
//                }
//            }
//            catch (Exception e)
//            {
//                objJsonResult.code = "0";
//                objJsonResult.count = 0;
//                objJsonResult.Message = "保存失败!" + e.ToString();
//                objJsonResult.data = 1;
//                return objJsonResult;
//            }
//        }
//        #endregion
//        #region å·¥åºæ´¾å·¥å• åˆ é™¤
//        /// <summary>
//        /// å·¥åºæ´¾å·¥å•删除
//        /// </summary>
//        /// <returns></returns>
//        [Route("Sc_ProcessSendWork/DelProcessSendWork")]
//        [HttpGet]
//        public object DelProcessSendWork(string HInterID, string user)
//        {
//            Int64 lngBillKey = 0;
//            lngBillKey = DBUtility.ClsPub.isLong(HInterID);
//            if (lngBillKey == 0)
//            {
//                objJsonResult.code = "0";
//                objJsonResult.count = 0;
//                objJsonResult.Message = "单据ID为空!";
//                objJsonResult.data = null;
//                return objJsonResult;
//            }
//            DAL.ClsSc_ProcessSendWork oBill = new DAL.ClsSc_ProcessSendWork();
//            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
//            {
//                ds = oCN.RunProcReturn("select * from Sc_ProcessSendWorkMain where HInterID=" + lngBillKey, "Sc_ProcessSendWorkMain");
//                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = "单据当前处于不能删除状态,不能删除!";
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
//                if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = "单据已经审核,不能删除!";
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
//                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
//                if (IsDete)
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 1;
//                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
//                else
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
//            }
//            else
//            {
//                objJsonResult.code = "0";
//                objJsonResult.count = 0;
//                objJsonResult.Message = "单据未找到";
//                objJsonResult.data = null;
//                return objJsonResult;
//            }
//        }
//        #endregion
//    }
//}
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -143,7 +143,7 @@
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                DateTime HDate = mainList[0].HDate;//日期
                int HYear = DateTime.Now.Year;
                double HPeriod = 1;
                double HPeriod = DateTime.Now.Month;
                string HRemark = mainList[0].HRemark;//备注
                string HMaker = mainList[0].HMaker;//制单人
                long HMaterID = mainList[0].HMaterID;//产品ID
@@ -354,6 +354,46 @@
        #endregion
        #region å·¥è‰ºè·¯çº¿åˆ—表 æŸ¥è¯¢ç³»ç»Ÿå‚æ•°
        /// <summary>
        /// è¿”回工艺路线列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("LEMS/MES_XT_List")]
        [HttpGet]
        public object MES_XT_List(string sWhere)
        {
            try
            {
                string flag = "flase";
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg))
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y")
                    {
                        flag = "true";
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = flag;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å·¥è‰ºè·¯çº¿ æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_RoutingBill/Gy_RoutingBillimport")]
        [HttpPost]
WebAPI/Controllers/LMESController.cs
@@ -558,6 +558,83 @@
            return GetObjectJson(ds);
        }
        #region åˆ¤æ–­ä¸‹æŽ¨çš„生产订单是否审核
        [Route("LEMS/ICMOBillCheck")]
        [HttpGet]
        public object ICMOBillCheck(string hmainid,string HEntryID,int OrganizationID)
        {
            DataSet ds;
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1  and hmainid=" + hmainid + " and  HEntryID=" + HEntryID + " order by å•据号 desc", "h_v_IF_ICMOBillList");
                string HNumber = ds.Tables[0].Rows[0]["产品代码"].ToString();
                if (ds.Tables[0].Rows[0]["审核人"].ToString() == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为未审核状态,不允许下推生成工序流转卡!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["关闭人"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为已关闭状态,不允许下推生成工序流转卡!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["作废人"].ToString() != "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单为已作废状态,不允许下推生成工序流转卡!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID + " and HSTOCKINORGID='" + OrganizationID + "'", "h_v_S_Sc_ICMOBillList");
                if (double.Parse(ds.Tables[0].Rows[0]["流转卡数量"].ToString()) == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单已全部下推生成工序流转卡,剩余可下推数量为0,不允许下推生成工序流转卡!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList where ç‰©æ–™ä»£ç ='" + HNumber + "'", "h_v_Gy_RoutingBillList");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "所选生产订单对应物料未设置对应的工艺路线,不允许下推生成工序流转卡!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// è¿”回工序委外接收单列表
        ///参数:string sql。
WebAPI/Controllers/MoveStockBillController.cs
@@ -614,7 +614,7 @@
                websLsmain.HBillerID = 0;
                websLsmain.HExplanation = "";
                websLsmain.HInnerBillNo = "";
                websLsmain.HRedBlueFlag = true;
                websLsmain.HRedBlueFlag = false;
                websLsmain.HMainSourceBillType = "-1";
                websLsmain.HStockStyle = "";
                websLsmain.HBillType = "1207";
@@ -622,34 +622,34 @@
                websLsmain.HSupID = 0;
                //websLsmain.HGroupID = lsmain[0].HGroupID;
                string sErrMsg = "";
                //上传前判断
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    sErrMsg = "校验上传前判断,发生错误!";
                    //return false;
                ////上传前判断
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
                //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                //{
                //    sErrMsg = "校验上传前判断,发生错误!";
                //    //return false;
                    objJsonResult.code = "99";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败!" + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                    {
                        sErrMsg = "单据号:" + websLsmain.HBillNo + ",单据ID:" + websLsmain.HInterID + ";" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                        //return false;
                        objJsonResult.code = "99";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "上传失败!" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                //    objJsonResult.code = "99";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "上传失败!" + sErrMsg;
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                //    {
                //        sErrMsg = "单据号:" + websLsmain.HBillNo + ",单据ID:" + websLsmain.HInterID + ";" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                //        //return false;
                //        objJsonResult.code = "99";
                //        objJsonResult.count = 0;
                //        objJsonResult.Message = "上传失败!" + sErrMsg;
                //        objJsonResult.data = null;
                //        return objJsonResult;
                    }
                }
                //    }
                //}
WebAPI/Controllers/OtherInStockController.cs
@@ -339,8 +339,8 @@
                List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getOtherInBillMainByJson(msg1);
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;
                WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
WebAPI/Controllers/OtherOutBillController.cs
@@ -472,8 +472,8 @@
                List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getOtherOutBillMainByJson(msg1);
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;
                WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
WebAPI/Controllers/ProductInController.cs
@@ -1239,8 +1239,8 @@
                List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
                ListModels listModels = new ListModels();
                list = listModels.getProductInBillMainByJson(jsonString);
                list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
                list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
                //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string hbillType = list[0].HBillType;
                WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
                clsKf_ProductInBillMain.HInterID = list[0].HInterID;
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -410,6 +410,14 @@
                string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
                //根据工序汇报单主ID获取工序汇报入库单的数据
                DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
                if(ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生成生产汇报单过程中没有查询到出站单";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataRow dr = ds.Tables[0].Rows[0];
                
                //保存
@@ -677,7 +685,7 @@
                //DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERPProcduct_LastProc where HLastProc = '是' and  hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
                DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc '" + BillNo + "'", "h_p_TOERPProcduct_LastProc");
                DataRow dr1 = ds1.Tables[0].Rows[0];
                if (ds1.Tables[0].Rows.Count <= 0)
                if (double.Parse(dr1[0].ToString()) <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -892,7 +900,7 @@
                //DataRow dr = ds.Tables[0].Rows[0];
                //判断本次报废总数量是否为0
                var DTable = oCN.RunProcReturn("select sum(HWasterQty) HWasterQty from  Sc_StationOutBillMain where  HProcExchBillNo='"+ BillNo + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
                var DTable = oCN.RunProcReturn("select isnull(sum(HWasterQty),0) HWasterQty from  Sc_StationOutBillMain where  HProcExchBillNo='"+ BillNo + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
                if (double.Parse(DTable.Rows[0]["HWasterQty"].ToString()) == 0)
                {
WebAPI/Controllers/WebAPIController.cs
@@ -4049,12 +4049,12 @@
        /// <returns></returns>
        [Route("Web/GetProcNoList")]
        [HttpGet]
        public object GetProcNoList(int HInterID,string sWhere)
        public object GetProcNoList(int HInterID,string sWhere,string UserID)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "'", "h_p_Sc_ProcNoList");
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -433,6 +433,83 @@
            }
        }
        #region [同步插件]
        [Route("Xs_SeOrderBill/Xs_SeOrderBillSaveApi")]
        [HttpPost]
        public object Xs_SeOrderBillSaveApi([FromBody] JObject sMainSub)
        {
            try
            {
                //LogService.Write("销售订单同步,保存方法执行完成异常:" + sMainSub.ToString());
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();
                model = "[" + model.ToString() + "]";
                List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(model);
                List<ClsXs_SeOrderBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(entry);
                string sql = string.Empty;
                oCN.BeginTran();
                sql = $"delete Xs_SeOrderBillMain where HinterID = {mainList[0].HInterID}";
                oCN.RunProc(sql);
                sql = $"delete Xs_SeOrderBillSub where HinterID = {mainList[0].HInterID}";
                oCN.RunProc(sql);
                //主表
                oCN.RunProc(@"Insert Into Xs_SeOrderBillMain
                        (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
                        ,HBillNo,HBillStatus
                        ,HAddress,HSSID,HSSDate,HCusID,HCurID,HExRate
                        ,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
                        ,HChecker,HCheckDate,HMaker,HMakeDate,HCloseMan,HCloseDate
                        ,HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID
                        ,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE)
                        values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1401 + "','" +
                    mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
                    ",'" + mainList[0].HSSDate + "'," + mainList[0].HCusID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HExplanation + "','" + mainList[0].HRemark + "','" +
                    mainList[0].HInnerBillNo + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
                     + mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HERPInterID + ",'"
                    + mainList[0].HERPBillType + "'," + mainList[0].HSALEORGID + "," + mainList[0].HSALEGROUPID + "," + mainList[0].HRECEIVEID + "," + mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HBUSINESSTYPE + "'" + ")");
                //保存子表
                foreach (var oSub in subList)
                {
                    sql = $@"
Insert into Xs_SeOrderBillSub
(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice
    ,HTaxPrice,HDiscountRate,HRelTaxPrice,HMoney,HTaxRate,HTaxMoney
    ,HLineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark
    ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
    ,HRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
    ,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID
    ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HMAPID,HSTOCKUNITID,HBASEUNITID
    ,HBFLOWID,HSETTLEORGID,HTAXCOMBINATION,HPRICEUNITID,HISFREE,HPRICECOEFFICIENT
    ,HSYSPRICE,HLIMITDOWNPRICE,HPARENTMATID,HROWTYPE,HROWID,HPARENTROWID
    ,HDELIVERYCONTROL,HLOCALCURRID,HEXCHANGETYPEID,HSETTLECURRID,HSETTLEMODEID
    ,HRECCONDITIONID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HEXCHANGERATE,HTAXRATEID
    ,HCOSTPERCENT,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HPRICELISTENTRY)
values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HTaxPrice}','{oSub.HDiscountRate}','{oSub.HRelTaxPrice}','{oSub.HMoney}','{oSub.HTaxRate}','{oSub.HTaxMoney}','{oSub.HLineTotal}','{oSub.HlineTotalBB}','{oSub.HDate}','{oSub.HOutStockQty}','{oSub.HInvoiceQty}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HRelationQty}','{oSub.HPropertyID}','{oSub.HBatChNo}','{oSub.HAuxPropID}','{oSub.HMTONo}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HWhID}','{oSub.HSPID}','{oSub.HSTOCKORGID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HMAPID}','{oSub.HSTOCKUNITID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HSETTLEORGID}','{oSub.HTAXCOMBINATION}','{oSub.HPRICEUNITID}','{oSub.HISFREE}','{oSub.HPRICECOEFFICIENT}','{oSub.HSYSPRICE}','{oSub.HLIMITDOWNPRICE}','{oSub.HPARENTMATID}','{oSub.HROWTYPE}','{oSub.HROWID}','{oSub.HPARENTROWID}','{oSub.HDELIVERYCONTROL}','{oSub.HLOCALCURRID}','{oSub.HEXCHANGETYPEID}','{oSub.HSETTLECURRID}','{oSub.HSETTLEMODEID}','{oSub.HRECCONDITIONID}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HEXCHANGERATE}','{oSub.HTAXRATEID}','{oSub.HCOSTPERCENT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}','{oSub.HPRICELISTENTRY}')";
                    oCN.RunProc(sql);
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write("销售订单同步异常,保存方法执行完成异常:" + e.Message.ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region [同步单据]
        [Route("Xs_SeOrderBill/Xs_SeOrderBillViewApi")]
        [HttpGet]
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -383,6 +383,89 @@
        #endregion
        #region [同步插件]
        [Route("Xs_SeOutStockBill/Xs_SeOutStockBillSaveApi")]
        [HttpPost]
        public object Xs_SeOutStockBillSaveApi([FromBody] JObject sMainSub)
        {
            try
            {
                //LogService.Write("发货通知单同步,保存方法执行完成异常:" + sMainSub.ToString());
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();
                model = "[" + model.ToString() + "]";
                List<ClsXs_SeOutStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillMain>>(model);
                List<ClsXs_SeOutStockBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillSub>>(entry);
                string sql = string.Empty;
                oCN.BeginTran();
                sql = $"delete Xs_SeOutStockBillMain where HinterID = {mainList[0].HInterID}";
                oCN.RunProc(sql);
                sql = $"delete Xs_SeOutStockBillSub where HinterID = {mainList[0].HInterID}";
                oCN.RunProc(sql);
                //主表
                oCN.RunProc(@"Insert Into Xs_SeOutStockBillMain
                        (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
                        ,HCusID,HManagerID,HDeptID,HRemark,HAddress,HSSID,HCurID,HWHID,HExRate
                        ,HEmpID,HExplanation,HInnerBillNo,HSALEORGID,HDELIVERYORGID,HOWNERID
                        ,HOWNERTYPEID,HERPInterID,HERPBillType,HMaker,HMakeDate,HChecker,HCheckDate
                        ,HCloseMan,HCloseDate,HSTOCKERGROUPID,HSALEGROUPID,HSALEDEPTID,HBUSINESSTYPE
                        ,HCARRIERID,HRECEIVERID,HSETTLEID,HPAYERID,HHEADLOCID,HRECCONTACTID
                        ,HRECEIPTCONDITIONID,HCORRESPONDORGID,HCARRIAGENO)
                        values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
                    mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "','" + mainList[0].HBillStatus + "'," + mainList[0].HCusID +
                    "," + mainList[0].HManagerID + "," + mainList[0].HDeptID + ",'" + mainList[0].HRemark + "','" + mainList[0].HAddress + "'," + mainList[0].HSSID +
                    "," + mainList[0].HCurID + "," + mainList[0].HWHID + "," + mainList[0].HExRate + "," + mainList[0].HEmpID + ",'" + mainList[0].HExplanation + "','"  + mainList[0].HInnerBillNo + "'," + mainList[0].HSALEORGID + "," + mainList[0].HDELIVERYORGID + "," + mainList[0].HOWNERID + ",'" +
                    mainList[0].HOWNERTYPEID + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "','" + mainList[0].HMaker + "','" + mainList[0].HMakeDate + "','"
                    + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HCloseMan + "','" + mainList[0].HCloseDate + "'," + mainList[0].HSTOCKERGROUPID + ","
                    + mainList[0].HSALEGROUPID + "," + mainList[0].HSALEDEPTID + ",'" + mainList[0].HBUSINESSTYPE + "'," + mainList[0].HCARRIERID + "," + mainList[0].HRECEIVERID + "," + mainList[0].HSETTLEID + "," + mainList[0].HPAYERID + "," + mainList[0].HHEADLOCID + "," + mainList[0].HRECCONTACTID + "," + mainList[0].HRECEIPTCONDITIONID + "," + mainList[0].HCORRESPONDORGID + ",'" + mainList[0].HCARRIAGENO + "'" + ")");
                //保存主表
                foreach (var oSub in subList)
                {
                    sql = $@"
Insert into Xs_SeOutStockBillSub
(HInterID,HEntryID,HMaterID,HUnitID,HQty,HPrice,HMoney,HWHID,HSPID,HRemark,
HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HSeOrderInterID,
HSeOrderEntryID,HSeORderBillNo,HOWNERID,HOWNERTYPEID,HSETTLEORGID,HMoveStockQty,
HRelationQty,HAuxPropID,HBatchNO,HMTONo,HERPInterID,HERPEntryID,HCUSTMATID,
HBASEUNITID,HBFLOWID,HOUTCONTROL,HSTOCKUNITID,HROWTYPE,HROWID,HPARENTROWID,
HPARENTMATID,HTAXCOMBINATION,HPRICECOEFFICIENT,HSYSPRICE,HLIMITDOWNPRICE,
HPRICEUNITID,HTAXPRICE,HTAXRATE,HTAXNETPRICE,HDISCOUNTRATE,HISFREE,HLOCALCURRID,
HSETTLECURRID,HEXCHANGETYPEID,HSETTLETYPEID,HRECEIPTCONDITIONID,HEXCHANGERATE,
HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HTaxRate_TAX,HCOSTPERCENT,HVAT,
HSELLERWITHHOLDING,HBUYERWITHHOLDING)
values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HUnitID}','{oSub.HQty}','{oSub.HPrice}','{oSub.HMoney}','{oSub.HWHID}','{oSub.HSPID}','{oSub.HRemark}','{oSub.HSourceInterID}',
'{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HSeOrderInterID}','{oSub.HSeOrderEntryID}','{oSub.HSeORderBillNo}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HSETTLEORGID}','{oSub.HMoveStockQty}',
'{oSub.HRelationQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HERPInterID}',
'{oSub.HERPEntryID}','{oSub.HCUSTMATID}','{oSub.HBASEUNITID}','{oSub.HBFLOWID}','{oSub.HOUTCONTROL}','{oSub.HSTOCKUNITID}','{oSub.HROWTYPE}',
'{oSub.HROWID}','{oSub.HPARENTROWID}',
'{oSub.HPARENTMATID}','{oSub.HTAXCOMBINATION}','{oSub.HPRICECOEFFICIENT}','{oSub.HSYSPRICE}','{oSub.HLIMITDOWNPRICE}','{oSub.HPRICEUNITID}','{oSub.HTAXPRICE}','{oSub.HTAXRATE}','{oSub.HTAXNETPRICE}','{oSub.HDISCOUNTRATE}','{oSub.HISFREE}',
'{oSub.HLOCALCURRID}','{oSub.HSETTLECURRID}','{oSub.HEXCHANGETYPEID}','{oSub.HSETTLETYPEID}','{oSub.HRECEIPTCONDITIONID}','{oSub.HEXCHANGERATE}','{oSub.HISINCLUDEDTAX}','{oSub.HISPRICEEXCLUDETAX}','{oSub.HTAXRATEID}',
'{oSub.HTaxRate_TAX}','{oSub.HCOSTPERCENT}','{oSub.HVAT}','{oSub.HSELLERWITHHOLDING}','{oSub.HBUYERWITHHOLDING}')";
                    oCN.RunProc(sql);
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write("发货通知单同步异常,保存方法执行完成异常:" + e.Message.ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region [同步单据]
        [Route("Xs_SeOutStockBill/Xs_SeOutStockBillViewApi")]
        [HttpGet]
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -708,6 +708,13 @@
            int k = 0;
            int n = 0;                  //同一批生成条码中的第几条
            string sTMNumber = "";      //条码自定义前缀
            string HCoilNO = "";
            string HFurnaceNO = "";
            string HFactory = "";
            decimal HAuxQty = 0;
            string HheatNO = "";
            DataSet Ds;
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
@@ -720,6 +727,12 @@
                    HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
                    HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
                    HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
                    HCoilNO = ClsPub.isStrNull(ordrlist[j].HCoilNO);
                    HFurnaceNO = ClsPub.isStrNull(ordrlist[j].HFurnaceNO);
                    HFactory = ClsPub.isStrNull(ordrlist[j].HFactory);
                    HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty);
                    HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO);
                    //日期获取方式
                    sDate = DateTime.Now.ToString();
                    //
@@ -990,6 +1003,12 @@
                        barcode.HInnerBillNo2 = ordrlist[j].HInnerBillNo;
                        barcode.HMaker2 = ordrlist[j].HMaker;
                        barcode.HGiveAwayFlag2 = ordrlist[j].HGiveAwayFlag;
                        barcode.HCoilNO = ordrlist[j].HCoilNO;
                        barcode.HFurnaceNO = ordrlist[j].HFurnaceNO;
                        barcode.HFactory = ordrlist[j].HFactory;
                        barcode.HAuxQty = ordrlist[j].HAuxQty;
                        barcode.HheatNO = ordrlist[j].HheatNO;
                        ListRows.Add(barcode);
                        k = k + 1;
                        n = n + 1;
@@ -1030,6 +1049,14 @@
            string HInnerBillNo = "";
            bool HGiveAwayFlag = false;
            Int64 HEntryID = 0;
            string HCoilNO2 = "";
            string HFurnaceNO2 = "";
            string HFactory2 = "";
            decimal HAuxQty2 = 0;
            string HheatNO2 = "";
            DateTime HProduceDate;
            DateTime HExpiryDate;
            try
            {
                oCN.BeginTran();
@@ -1074,6 +1101,14 @@
                        HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
                        HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
                        HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
                        HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
                        HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
                        HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
                        HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
                        HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
                        HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
                        HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
                        oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1081,7 +1116,8 @@
                                    ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                    ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                    ",HGiveAwayFlag " +
                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " +
                                    ") values ("
                                    + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1090,7 +1126,7 @@
                                    + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                    + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")");
                        //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MaterTypeBillController.cs
@@ -356,5 +356,86 @@
            }
        }
        #endregion
        #region ç‰©æ–™åˆ†ç±» æ ‘形图
        public class TreeModel
        {
            public string id { get; set; }
            public string title { get; set; }
            public List<TreeModel> children = new List<TreeModel>();
        }
        [Route("Gy_MaterType/Gy_MaterTypeTreeList")]
        [HttpGet]
        public object Gy_DutyBillTreeList()
        {
            try
            {
                string sql1 = string.Format("select hitemid,hnumber,hname from Gy_MaterType order by hnumber");
                ds = oCN.RunProcReturn(sql1, "Gy_MaterType");
                List<TreeModel> treeModels = new List<TreeModel>();
                TreeModel first = new TreeModel();
                first.id = "0";
                first.title = "物料分类设置";
                treeModels.Add(first);
                foreach (DataRow row in ds.Tables[0].Rows)
                {
                    var strLen = row["hnumber"].ToString().Split('.');
                    if (strLen.Length == 1)
                    {
                        TreeModel tree = new TreeModel();
                        tree.id = row["hnumber"].ToString();
                        tree.title = row["hname"].ToString();
                        treeModels[0].children.Add(tree);
                    }
                }
                digui(ds.Tables[0], treeModels[0].children, 2);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// é€’归函数
        /// </summary>
        public void digui(DataTable dt, List<TreeModel> tree, int num)
        {
            for (int m = 0; m < tree.Count; m++)
            {
                tree[m].children = new List<TreeModel>();
                for (int i = 0; i < dt.Rows.Count; i++)//第一次循环,得到所有根节点的子集
                {
                    var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
                    if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
                    {
                        TreeModel tbjson = new TreeModel();
                        tbjson.id = dt.Rows[i]["hnumber"].ToString();
                        tbjson.title = dt.Rows[i]["hname"].ToString();
                        tree[m].children.Add(tbjson);
                    }
                }
                var strLens = tree[m].id.Split('.');
                for (int i = 0; i < tree[m].children.Count; i++)
                {
                    digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环,拿出子集的子集
                }
            }
        }
        #endregion
    }
}
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_TaxMIXController.cs
@@ -110,6 +110,9 @@
            {
                DAL.ClsGy_TaxMIX_Ctl oBill = new DAL.ClsGy_TaxMIX_Ctl();
                List<Model.ClsGy_TaxMIXMain_Model> lsmain = new List<Model.ClsGy_TaxMIXMain_Model>();
                //List<Model.ClsGy_TaxMIXSub_Model> lssub = new List<Model.ClsGy_TaxMIXSub_Model>();
                List<Model.ClsGy_TaxMIXSub_Model> lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaxMIXSub_Model>>(msg2);
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_TaxMIXMain(msg1);
@@ -241,6 +244,10 @@
                    oItem.HLevel = 1; //等级 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
                    oBill.oModel = oItem;
                }
                foreach (Model.ClsGy_TaxMIXSub_Model oItemSub in lssub)
                {
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
@@ -329,7 +336,7 @@
                }
                oCN.RunProc("delete from Gy_TaxMIXMain where HItemID=" + HItemID);
                oCN.RunProc("delete from Gy_TaxMIXSub where HTaxMixID=" + HItemID);
                oCN.RunProc("delete from Gy_TaxMIXSub where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -112,17 +112,27 @@
                {
                    //主表
                    oCN.RunProc(@"Insert Into Sc_ICMOBillMain   
                        (HBillType,HInterID,HBillNo,HDate,HPRDORGID
                        (HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HISENTRUST,HISREWORK)
                        values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
                        values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
                    "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                    ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
                    "," + HCenterID + "," + HPlanQty + ",0,0,0,0,'',''" + "," + HISENTRUST + "," + HISREWORK + ") ");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
                {
                    if (ds.Tables[0].Rows[0]["审核人"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核,不允许修改!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //修改
                    oCN.RunProc("update Sc_ICMOBillMain  set " +
                                "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
                                ", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
@@ -175,7 +185,7 @@
            long HSeOrderEntrySEQ = DetailColl[0].HSeOrderEntrySEQ == null ? 0 : DetailColl[0].HSeOrderEntrySEQ;        //销售订单行号,
            string HPROJECTNO = DetailColl[0].HPROJECTNO == null ? "''" : DetailColl[0].HPROJECTNO;   //项目编号,
            long HPRODUCTTYPE = DetailColl[0].HPRODUCTTYPE == null ? 0 : DetailColl[0].HPRODUCTTYPE;            //产品类型,
            long HCOSTRATE = DetailColl[0].HCOSTRATE == null ? 0 : DetailColl[0].HCOSTRATE;            // æƒé‡,
            double HCOSTRATE = DetailColl[0].HCOSTRATE == null ? 0 : DetailColl[0].HCOSTRATE;            // æƒé‡,
            long HBASEUNITID = DetailColl[0].HBASEUNITID == null ? 0 : DetailColl[0].HBASEUNITID;       //基本计量单位,
            int i = 0;
@@ -233,12 +243,13 @@
                ,HBeginDate,HEndDate
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID)
                ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID
                ,HSTOCKINORGID)
                 values({HInterID},{i},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
                        ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID})");
                        ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID},{oSub.HSTOCKINORGID})");
            }
            objJsonResult.code = "1";
@@ -289,12 +300,14 @@
                ,HPlanBeginDate,HPlanEndDate
                ,HBeginDate,HEndDate
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ)
                 values({oSub.HInterID},{oSub.HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},4
                        ,0,0,'','',0,0)");
                        ,0,0,'','',0,0
                ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ})");
                }
                foreach (var _item in _mainList)
@@ -434,17 +447,27 @@
                {
                    //主表
                    oCN.RunProc(@"Insert Into Sc_ICMOBillMain   
                        (HBillType,HInterID,HBillNo,HDate,HPRDORGID
                        (HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate)
                        values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
                        values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
                    "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                    ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
                    "," + HCenterID + ",0,0,0,0," + HBomID + ",'','') ");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
                {
                    if (ds.Tables[0].Rows[0]["审核人"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核,不允许修改!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //修改
                    oCN.RunProc("update Sc_ICMOBillMain  set " +
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                ", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
@@ -534,14 +557,16 @@
                ,HPlanBeginDate,HPlanEndDate
                ,HBeginDate,HEndDate
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HBomID,HEntryCusID
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
                ,HBomID,HEntryCusID,HSTOCKINORGID
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HAuxQty,HAuxUnit,HWidth,HWeight)
                 values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
                 ,{oSub.HBomID}  ,{oSub.HCusID}
                        ,0,0,'','',0,0)");
                 ,{oSub.HBomID}  ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
                        ,0,0,'','',0,0
                ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight})");
            objJsonResult.code = "1";
@@ -822,6 +847,16 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不是未审核状态,不允许删除!";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                oCN.RunProc("delete from Sc_ICMOBillMain  where HInterID=" + HInterID);
                oCN.RunProc("delete from Sc_ICMOBillSub  where HInterID=" + HInterID);
                oCN.Commit();//提交事务
WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -26,14 +26,14 @@
                    ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
                    ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
                    ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME) " +
                    ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -137,6 +137,8 @@
                    ",HCHECKPRODUCT=" + oModel.HCHECKPRODUCT.ToString() +
                    ",HPERUNITSTANDHOUR=" + oModel.HPERUNITSTANDHOUR.ToString() +
                    ",HSTDLABORPREPARETIME=" + oModel.HSTDLABORPREPARETIME.ToString() +
                    ",HWeight=" + oModel.HWeight.ToString() +
                    ",HWidth=" + oModel.HWidth.ToString() +
                    ",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/ListModels.cs
@@ -1534,6 +1534,60 @@
            return list;
        }
        ///工序返工记录单 ä¸»è¡¨
        ///ClsSc_ProcExchRecordBackBillMain
        public List<Model.ClsSc_ProcExchRecordBackBillMain> getObjectByJson_ClsSc_ProcExchRecordBackBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchRecordBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillMain>>(jsonString);
            return list;
        }
        ///工序返工记录单 å­è¡¨
        ///ClsSc_ProcExchRecordBackBillSub
        public List<Model.ClsSc_ProcExchRecordBackBillSub> getObjectByJson_ClsSc_ProcExchRecordBackBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchRecordBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchRecordBackBillSub>>(jsonString);
            return list;
        }
        ///工序派工单 ä¸»è¡¨
        ///ClsSc_ProcExchWorkBackBillMain
        public List<Model.ClsSc_ProcessSendWorkMain> getObjectByJson_ClsSc_ProcessSendWorkMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcessSendWorkMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkMain>>(jsonString);
            return list;
        }
        ///工序派工单 å­è¡¨
        ///ClsSc_ProcExchWorkBackBillMain
        public List<Model.ClsSc_ProcessSendWorkSub> getObjectByJson_ClsSc_ProcessSendWorkSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcessSendWorkSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkSub>>(jsonString);
            return list;
        }
        ///流转卡工序派工单 ä¸»è¡¨
        ///ClsSc_ProcExchWorkBackBillMain
        public List<Model.ClsSc_ProcExchSendWorkBillMain> getObjectByJson_ClsSc_ProcExchSendWorkBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchSendWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillMain>>(jsonString);
            return list;
        }
        ///流转卡工序派工单 å­è¡¨
        ///ClsSc_ProcExchWorkBackBillMain
        public List<Model.ClsSc_ProcExchSendWorkBillSub> getObjectByJson_ClsSc_ProcExchSendWorkBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchSendWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchSendWorkBillSub>>(jsonString);
            return list;
        }
        ///设备投产检验验收单 å­è¡¨
        ///ClsSb_EquipWorkBeforeCheckBillSub
        public List<Model.ClsSb_EquipWorkBeforeCheckBillSub> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillSub(string jsonString)
WebAPI/Models/ClsGy_Material_Model.cs
@@ -44,7 +44,9 @@
        public int HCREATEORGID;
        public int HBatchManager;
        public string HOldMaterNumber;
        public double HWidth; //幅宽
        public double HWeight; //克重
        public int HSALEUNITID; //销售计量单位(gy_unit)
        public int HSALEPRICEUNITID; //销售计价计量单位(gy_unit)
        public int HBASEUNITID; //基本计量单位(gy_unit)
WebAPI/Models/HBarCodeList.cs
@@ -62,5 +62,14 @@
        public string HInnerBillNo2 { get; set; } //"内部采购订单号";
        public string HMaker2 { get; set; } //"制单人";
        public string HEntryID2 { get; set; } //"行号";
        public decimal HAuxQty { get; set; } //"负责数量";
        public string HFurnaceNO { get; set; } //"炉号";
        public string HCoilNO { get; set; } //"钢卷号";
        public string HheatNO { get; set; } //"热处理号";
        public string HFactory { get; set; } //"厂商";
        public DateTime HProduceDate { get; set; } //"生产日期";
        public DateTime HExpiryDate { get; set; } //"保质期至";
    }
}
WebAPI/Models/HSouceOrderList.cs
@@ -61,5 +61,13 @@
        public string HShowDate{get;set;} // "日期";
        public string HInnerBillNo{get;set;} // "内部采购订单号";
        public string HMaker{get;set;} // "制单人";
        }
        public decimal HAuxQty { get; set; } //"负责数量";
        public string HFurnaceNO { get; set; } //"炉号";
        public string HCoilNO { get; set; } //"钢卷号";
        public string HheatNO { get; set; } //"热处理号";
        public string HFactory { get; set; } //"厂商";
        public DateTime HProduceDate { get; set; } //"生产日期";
        public DateTime HExpiryDate { get; set; } //"保质期至";
    }
}
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,83 +5,83 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2023-01-11T05:30:27.8190489Z;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
    <History>True|2023-03-13T03:19:32.0927720Z;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 16:43:40</publishTime>
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>03/03/2023 13:34:09</publishTime>
      <publishTime>03/13/2023 11:18:52</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>03/03/2023 13:34:09</publishTime>
      <publishTime>03/13/2023 11:18:52</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
      <publishTime>12/17/2020 21:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>03/03/2023 13:34:07</publishTime>
      <publishTime>03/13/2023 11:18:48</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>03/03/2023 13:34:07</publishTime>
      <publishTime>03/13/2023 11:18:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/15/2022 13:55:23</publishTime>
      <publishTime>03/03/2023 13:34:05</publishTime>
      <publishTime>03/13/2023 11:18:36</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/09/2022 16:01:58</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>03/03/2023 13:34:05</publishTime>
      <publishTime>03/13/2023 11:18:36</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
      <publishTime>03/22/2022 05:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/19/2022 07:39:42</publishTime>
      <publishTime>03/18/2022 23:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 13:17:20</publishTime>
      <publishTime>03/22/2022 05:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/19/2022 07:39:48</publishTime>
      <publishTime>03/18/2022 23:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/07/2023 09:16:49</publishTime>
      <publishTime>02/09/2023 20:21:24</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -90,99 +90,99 @@
      <publishTime>09/20/2018 19:28:34</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/19/2015 01:02:50</publishTime>
      <publishTime>03/18/2015 17:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 19:48:56</publishTime>
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>03/03/2023 13:34:06</publishTime>
      <publishTime>03/13/2023 11:18:37</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>03/03/2023 13:34:06</publishTime>
      <publishTime>03/13/2023 11:18:37</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/04/2014 04:33:56</publishTime>
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 09:07:56</publishTime>
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:29</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:34</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:34</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/30/2012 22:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:35</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>03/03/2023 13:34:04</publishTime>
      <publishTime>03/13/2023 11:18:35</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
      <publishTime>02/15/2015 17:57:08</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
      <publishTime>07/19/2017 10:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -206,19 +206,19 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 18:03:34</publishTime>
      <publishTime>08/19/2014 10:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/18/2019 00:24:34</publishTime>
      <publishTime>04/17/2019 16:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 21:00:36</publishTime>
      <publishTime>11/28/2018 13:00:36</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
      <publishTime>09/18/2018 19:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -227,7 +227,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 20:58:44</publishTime>
      <publishTime>11/28/2018 12:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -242,37 +242,37 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 21:01:26</publishTime>
      <publishTime>11/28/2018 13:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 21:01:00</publishTime>
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
      <publishTime>01/28/2015 04:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 23:26:04</publishTime>
      <publishTime>02/11/2014 15:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 12:02:32</publishTime>
      <publishTime>01/28/2015 04:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 12:04:30</publishTime>
      <publishTime>01/28/2015 04:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -281,12 +281,12 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>03/03/2023 13:34:12</publishTime>
      <publishTime>03/13/2023 11:19:13</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,190 +294,190 @@
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>03/03/2023 13:34:12</publishTime>
      <publishTime>03/13/2023 11:19:13</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
      <publishTime>07/17/2013 17:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 21:26:02</publishTime>
      <publishTime>11/29/2018 13:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 21:26:30</publishTime>
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>08/16/2022 22:31:46</publishTime>
      <publishTime>08/19/2022 08:17:39</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>11/01/2021 09:26:33</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/07/2023 09:16:49</publishTime>
      <publishTime>02/09/2023 20:21:24</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>11/29/2022 08:58:24</publishTime>
      <publishTime>11/29/2022 10:36:46</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>03/15/2022 10:06:42</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>02/26/2023 19:50:05</publishTime>
      <publishTime>01/10/2023 11:14:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>02/26/2023 19:50:04</publishTime>
      <publishTime>01/10/2023 11:14:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>02/26/2023 19:50:05</publishTime>
      <publishTime>01/10/2023 11:14:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>02/26/2023 19:50:05</publishTime>
      <publishTime>01/10/2023 11:14:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>02/26/2023 19:50:05</publishTime>
      <publishTime>01/10/2023 11:14:47</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>02/26/2023 19:50:04</publishTime>
      <publishTime>01/10/2023 11:14:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>02/26/2023 19:50:06</publishTime>
      <publishTime>01/10/2023 11:14:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>02/26/2023 19:50:04</publishTime>
      <publishTime>01/10/2023 11:14:51</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>02/26/2023 19:50:07</publishTime>
      <publishTime>01/10/2023 11:14:50</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>02/26/2023 19:50:06</publishTime>
      <publishTime>01/10/2023 11:14:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>02/26/2023 19:50:07</publishTime>
      <publishTime>01/10/2023 11:14:50</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>02/26/2023 19:50:06</publishTime>
      <publishTime>01/10/2023 11:14:49</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>02/26/2023 19:50:06</publishTime>
      <publishTime>01/10/2023 11:14:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>02/26/2023 19:50:08</publishTime>
      <publishTime>01/10/2023 11:14:50</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>02/26/2023 19:50:07</publishTime>
      <publishTime>01/10/2023 11:14:49</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>02/26/2023 19:50:07</publishTime>
      <publishTime>01/10/2023 11:14:50</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>02/26/2023 19:50:06</publishTime>
      <publishTime>01/10/2023 11:14:49</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>02/26/2023 19:50:08</publishTime>
      <publishTime>01/10/2023 11:14:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>02/26/2023 19:50:08</publishTime>
      <publishTime>01/10/2023 11:14:51</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.cs">
      <publishTime>12/20/2021 13:19:56</publishTime>
@@ -492,12 +492,12 @@
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web References/WebS2/Reference.map">
      <publishTime>02/26/2023 19:52:25</publishTime>
      <publishTime>03/06/2023 08:54:11</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/14/2022 11:24:08</publishTime>
      <publishTime>11/02/2022 22:03:20</publishTime>
      <publishTime>03/03/2023 13:34:25</publishTime>
      <publishTime>03/13/2023 11:19:29</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Web.config
@@ -28,6 +28,8 @@
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
      <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    ç‘žä¸Žç¥º-->
      <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/>    æ£®æ¥·-->
      <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>  -->
      <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/>     å®‰ç‘žæœåС噍-->
      <add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>  
      <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>     å®‰ç‘žæœåС噍-->
      <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>    æµ‹è¯•服务器-->
WebAPI/WebAPI.csproj
@@ -402,6 +402,9 @@
    <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
    <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
    <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_ProcExchRecordBackBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
    <Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
    <Compile Include="Controllers\Gy_MateMouldController.cs" />
@@ -996,6 +999,9 @@
    <Folder Include="Views\Sc_MouldScrapRequestBill\" />
    <Folder Include="Views\Sc_MouldStatusChangeBill\" />
    <Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
    <Folder Include="Views\Sc_ProcessSendWork\" />
    <Folder Include="Views\Sc_ProcExchRecordBackBill\" />
    <Folder Include="Views\Sc_ProcExchSendWorkBill\" />
    <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
    <Folder Include="Views\Sc_WorkBillSortBill\" />
    <Folder Include="Views\Sc_WorkDemandPlanBill\" />