1

wtt

2024-09-29 19d0afadbe1c90e227b852db0a97ae413e90691f

1

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSb_MouldRepairWorkBill.cs

@@ -63,6 +63,7 @@
                ",HCycleUnit='" + omodel.HCycleUnit + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HRepairAccepDate='" + omodel.HRepairAccepDate + "'" +
                ",HSupID=" + omodel.HSupID.ToString() +
                ",HRepairType='" + omodel.HRepairType + "'" +
                ",HNewModel='" + omodel.HNewModel + "'" +
@@ -161,6 +162,7 @@
                ",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID"+
                ",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
                ",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
                ",HRepairAccepDate" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
@@ -168,7 +170,7 @@
                ",'" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
                "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMouldID.ToString() +
                 ", " + omodel.HSupID.ToString() + ",'" + omodel.HRepairType + "','" + omodel.HNewModel + "'," + omodel.HNewDesignLife.ToString() +",'"+ omodel.HMainSourceBillType+"',"+ omodel.HMainSourceInterID.ToString()+","+ omodel.HMainSourceEntryID.ToString()+
                ") ");
                ",'"+ omodel.HRepairAccepDate + "') ");
                //插入子表
                foreach (Model.ClsSb_MouldRepairWorkBillSub oSub in DetailColl)
                {

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainBill.cs

@@ -117,6 +117,10 @@
                ",HEndDate='" + omodel.HEndDate + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HRequestComDate='" + omodel.HRequestComDate + "'" +
                ",HRecentMainModule='" + omodel.HRecentMainModule + "'" +
                ",HCumulativeModule='" + omodel.HCumulativeModule + "'" +
                ",HProductionModule='" + omodel.HProductionModule + "'" +
                ",HMouldMaintainRuleInterID=" + omodel.HMouldMaintainRuleInterID.ToString() +
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                ",HLastResult='" + omodel.HLastResult + "'" +
@@ -210,6 +214,7 @@
                ",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
                ",HEndDate"+
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
                ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
@@ -217,7 +222,7 @@
                ",'" + omodel.HEndDate + "'"+
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
                ",'" + omodel.HLastResult + "'" + 
                ") ");
                ",'"+ omodel.HRequestComDate + "'," + omodel.HRecentMainModule + "," + omodel.HCumulativeModule + "," + omodel.HProductionModule + ") ");

                if (DetailCol.Count > 0)
                {

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBill.cs

@@ -10,11 +10,12 @@
        public Model.ClsSc_MouldMaintainPlanBillMain omodel = new Model.ClsSc_MouldMaintainPlanBillMain();
        public List<Model.ClsSc_MouldMaintainPlanBillSub> DetailColl = new List<Model.ClsSc_MouldMaintainPlanBillSub>();
        public List<Model.ClsSc_MouldMaintainPlanBillSub_Item> DetailCol = new List<Model.ClsSc_MouldMaintainPlanBillSub_Item>();
        public List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> DetailCol2 = new List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>();

        public ClsSc_MouldMaintainPlanBill()
        {
            base.MvarItemKeySub = "Sc_MouldMaintainPlanBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub2 = "Sc_MouldMaintainPlanBillSub_Plan";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="Sc_MouldMaintainPlanBillMain";
@@ -77,6 +78,7 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                DeleteBillSub2(lngBillKey);
                oCn.RunProc("delete from Sc_MouldMaintainPlanBillSub_Item where HInterID=" + lngBillKey);
                
                omodel.HInterID = lngBillKey;
@@ -113,6 +115,23 @@
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + ",'" + Item.HMaintainItem.ToString() +
                          "') ");
                }

                //插入点检计划
                foreach (Model.ClsSc_MouldMaintainPlanBillSub_Plan Items in DetailCol2)
                {
                    oCn.RunProc("Insert into Sc_MouldMaintainPlanBillSub_Plan " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HPlanDate,HPlanBeginTime,HPlanEndTime,HSafeEndTime,HErrBeginTime," +
                      "HRelationFlag,HSendFlag,HErrBeginQty,HUseNowQty,HUseEndQty" +

                      ") values("
                      + omodel.HInterID.ToString() + "," + Items.HEntryID.ToString() + ",'" + Items.HCloseMan + "','" + Items.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(Items.HCloseType ? 1 : 0) + ",'" + Items.HRemark + "'" +
                      "," + Items.HSourceInterID.ToString() + "," + Items.HSourceEntryID.ToString() + ",'" + Items.HSourceBillNo + "','" + Items.HSourceBillType + "'," + Items.HRelationQty.ToString() + "," + Items.HRelationMoney.ToString() +
                      ",'" + Items.HPlanDate.ToString() + "','" + Items.HPlanBeginTime.ToString() + "','" + Items.HPlanEndTime.ToString() + "','" + Items.HSafeEndTime.ToString() + "','" + Items.HErrBeginTime.ToString() + "'," +
                      "'" + DBUtility.ClsPub.BoolToString(Items.HRelationFlag) + "','" + DBUtility.ClsPub.BoolToString(Items.HSendFlag) + "','" + Items.HErrBeginQty.ToString() + "','" + Items.HUseNowQty.ToString() + "','" + Items.HUseEndQty.ToString() +
                      "') ");
                }
                //
                //foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
                //{

 DAL/Öʼì¹ÜÀí/ClsQC_TakeSampleCheckBill.cs

@@ -74,6 +74,7 @@
                "',HProdWeight2='" + omodel.HProdWeight2.ToString() +
                "',HProdWeight3='" + omodel.HProdWeight3.ToString() +
                "',HBadNote='" + omodel.HBadNote.ToString() +
                "',TestType='" + omodel.TestType.ToString() +
                "' where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -107,14 +108,14 @@
                ",HYear,HPeriod,HRemark" +
                ",HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
                ",HProcExchBillNo,HProcExchQty,HDeptID,HMaterID,HUnitID,HBatchNo,HCheckEmp,HProcID" +
                ",HGroupID,HShiftsID,HQty,HSourceOrgID,HInspectOrgID,HSampleDamageQty,HBadNote,HProdWeight1,HProdWeight2,HProdWeight3" +
                ",HGroupID,HShiftsID,HQty,HSourceOrgID,HInspectOrgID,HSampleDamageQty,HBadNote,HProdWeight1,HProdWeight2,HProdWeight3,TestType" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                ",'" + omodel.HSourceID.ToString() + "','" + omodel.HICMOInterID.ToString() + "','" + omodel.HICMOEntryID.ToString() + "','" + omodel.HICMOBillNo.ToString() + "','" + omodel.HICMOQty.ToString() + "','" + omodel.HProcExchInterID.ToString() + "','" + omodel.HProcExchEntryID.ToString() +
                "','" + omodel.HProcExchBillNo + "','" + omodel.HProcExchQty.ToString() + "','" + omodel.HDeptID.ToString() + "','" + omodel.HMaterID.ToString() + "','" + omodel.HUnitID.ToString() + "','" + omodel.HBatchNo.ToString() +
                "','" + omodel.HCheckEmp.ToString() + "','" + omodel.HProcID.ToString() + "','" + omodel.HGroupID.ToString() + "','" + omodel.HShiftsID.ToString() + "','" + omodel.HQty.ToString() + "','" + omodel.HSourceOrgID.ToString() + "','" +omodel.HInspectOrgID.ToString()+
              "','" + omodel.HSampleDamageQty.ToString() + "','" + omodel.HBadNote + "','" + omodel.HProdWeight1.ToString() + "','" + omodel.HProdWeight2.ToString() + "','" + omodel.HProdWeight3.ToString() + "') ");              
              "','" + omodel.HSampleDamageQty.ToString() + "','" + omodel.HBadNote + "','" + omodel.HProdWeight1.ToString() + "','" + omodel.HProdWeight2.ToString() + "','" + omodel.HProdWeight3.ToString() + "','" + omodel.TestType.ToString() + "') ");              
                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;

 LMES/Program.cs

@@ -15,44 +15,44 @@
        {
            Application.EnableVisualStyles();
            Application.SetCompatibleTextRenderingDefault(false);
            Application.Run(new DingDing_autoGetData());
            //Application.Run(new DingDing_autoGetData());


            //DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
            //Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
            //Pub_Class.ClsPub.SetIPAddress();
            //DBUtility.ClsPub.SetIPAddress();
            //DBUtility.ClsPub.VersionNum = "12.1";
            //Pub_Class.ClsPub.VersionNum = "12.1";//
            ////===================================================================
            //try
            //{
            //    if (DBUtility.ClsPub.CheckUpdate())
            //    {
            //        MessageBox.Show("发现最新版本,需要更新！");
            //        string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
            //        System.Diagnostics.Process.Start(strFileName);
            //        Application.Exit();
            //        return;
            //    }
            //    else
            //    {
            //        //============================================
            //        BLL.FrmLogin frmlg = new BLL.FrmLogin();
            //        frmlg.ShowDialog();
            //        if (frmlg.isOk)
            //        {
            //            MDIMain MainFrm = new MDIMain();
            //            Application.Run(MainFrm);
            //        }
            //    }
            //}
            //catch (Exception e)
            //{
            //    MessageBox.Show(e.Message);
            //    Application.Exit();
            //    return;
            //}
            DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
            Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
            Pub_Class.ClsPub.SetIPAddress();
            DBUtility.ClsPub.SetIPAddress();
            DBUtility.ClsPub.VersionNum = "12.1";
            Pub_Class.ClsPub.VersionNum = "12.1";//
            //===================================================================
            try
            {
                if (DBUtility.ClsPub.CheckUpdate())
                {
                    MessageBox.Show("发现最新版本,需要更新！");
                    string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
                    System.Diagnostics.Process.Start(strFileName);
                    Application.Exit();
                    return;
                }
                else
                {
                    //============================================
                    BLL.FrmLogin frmlg = new BLL.FrmLogin();
                    frmlg.ShowDialog();
                    if (frmlg.isOk)
                    {
                        MDIMain MainFrm = new MDIMain();
                        Application.Run(MainFrm);
                    }
                }
            }
            catch (Exception e)
            {
                MessageBox.Show(e.Message);
                Application.Exit();
                return;
            }
        }
    }
}

 Model/Model.csproj

@@ -147,6 +147,7 @@
    <Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_TechnologyParameterType_Model .cs" />
    <Compile Include="基础资料\基础资料\ClsGy_RestDay_Model.cs" />
    <Compile Include="生产管理\模具管理\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
    <Compile Include="质检管理\ClsQC_MonthTarGetBillMain.cs" />
    <Compile Include="质检管理\ClsQC_MonthTarGetBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSignBillMain.cs" />

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSb_MouldRepairWorkBillMain.cs

@@ -10,6 +10,7 @@
        public Int64 HRepairID;//    --维修项目(Gy_Repair)
        public DateTime HRepairBeginDate;//  --维修开始日期
        public DateTime HRepairEndDate;//  --维修结束日期
        public DateTime HRepairAccepDate;//  --维修受理日期
        public string HRepairContent;//   --维修内容
        public string HCycleUnit;//   varchar(10)    --时间单位(小时，天)
        public double HPlanTimes;//  money         --计划维修工时

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainBillMain.cs

@@ -22,5 +22,9 @@
        public int HMouldMaintainPlanEntryID; //器具保养计划单（Sc_MouldMaintainPlanBillSub_Plan）子内码

        public string HLastResult;
        public string HRequestComDate;
        public Int64 HRecentMainModule;
        public Int64 HCumulativeModule;
        public Int64 HProductionModule;
    }
}

 Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBillSub_Plan.cs

New file
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsSc_MouldMaintainPlanBillSub_Plan : DBUtility.ClsXt_BaseBillSub
    {
        //============

        public string HPlanDate; // --计划日期
        public string HPlanBeginTime; //--计划开始时间点（默认00：00：00）
        public string HPlanEndTime; //--计划结束时间点（默认23：59：59）
        public string HSafeEndTime; //--安全结束时间点
        public string HErrBeginTime; //--预警开始时间点  
        public bool HRelationFlag; // --关联标记（是否已生成保养记录）
        public bool HSendFlag; //是否发送信息 ï¼ˆå‘送钉钉）
        public int HErrBeginQty; //预警开始次数
        public int HUseNowQty; //当前使用次数
        public int HUseEndQty; //结束使用次数
    }
}

 Model/Öʼì¹ÜÀí/ClsQC_TakeSampleCheckBillMain.cs

@@ -32,6 +32,7 @@
        public Double HProdWeight1;  //dec(18,8) --产品单重1(界面默认为0) 
        public Double HProdWeight2;  //dec(18,8) --产品单重2(界面默认为0) 
        public Double HProdWeight3;  //dec(18,8) --产品单重3(界面默认为0) 
        public string TestType;  //dec(18,8) --产品单重3(界面默认为0) 

    }
}

 Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillSub_BatchSplit.cs

@@ -20,6 +20,7 @@
        public string HBillNo;//流转卡号
        public string HBatchNo;//批次
        public string HGroupNumber;//班组        
        public Int64 HWorkShopID;//生产车间内码
    }
}


 PayM/bin/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/bin/Debug/BLL.dll

Binary files differ

 PayM/bin/Debug/BLL.pdb

Binary files differ

 PayM/bin/Debug/DAL.dll

Binary files differ

 PayM/bin/Debug/DAL.pdb

Binary files differ

 PayM/bin/Debug/DBUtility.dll

Binary files differ

 PayM/bin/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/bin/Debug/Model.dll

Binary files differ

 PayM/bin/Debug/Model.pdb

Binary files differ

 PayM/bin/Debug/PayM.dll

Binary files differ

 PayM/bin/Debug/PayM.pdb

Binary files differ

 PayM/bin/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/Debug/SQLHelper.pdb

Binary files differ

 PayM/obj/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/obj/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/obj/Debug/PayM.dll

Binary files differ

 PayM/obj/Debug/PayM.pdb

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs

File was deleted

 SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache

File was deleted

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

File was deleted

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs

@@ -703,6 +703,7 @@
            Int64 HBadReasonID = 0;     //不良原因ID
            string HCusMaterName = "";  //客户物料名称
            string HCusModel = "";      //客户规格型号
            string HBarCode_Pack = "";  //托盘条码

            HBarCode = TM;
            HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
@@ -719,6 +720,7 @@
            HBadReasonID = DBUtility.ClsPub.isLong(txtHRemark.Tag);
            HCusMaterName = DBUtility.ClsPub.isStrNull(txtHCusMaterName.Text);
            HCusModel = DBUtility.ClsPub.isStrNull(txtHCusModel.Text);
            HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);

            try
            {
@@ -730,7 +732,7 @@
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
                ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag,HBarCode_Pack " +
                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
                ") Values ("
@@ -739,7 +741,7 @@
                + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "',''"
                + ", 1," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + "," + HNowQty.ToString()
                + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
                + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0,'" + HBarCode_Pack + "'"
                + ", " + HProcessExchangeInterID.ToString() + ",0,'" + HProcessExchangeBillNo + "'," + HBadReasonID.ToString() + ",'" + HCusMaterName + "','" + HCusModel + "'"
                + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1')");

@@ -761,8 +763,8 @@
                    " Values("
                    + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HMaterID.ToString() + "," + HAuxPropID.ToString() + ",0"
                    + "," + HWhID.ToString() + ",0," + HSPID.ToString() + ",0,0,''"
                    +",0," + HQty.ToString() + ",1,'" + HBatchNo + "','" + HBarCode + "',''"
                    +",'" + HMaker + "',getdate()," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillType + "','" + HSourceBillNo + "'"
                    +",0," + HQty.ToString() + ",1,'" + HBatchNo + "','" + HBarCode + "','" + HBarCode_Pack + "'"
                    + ",'" + HMaker + "',getdate()," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillType + "','" + HSourceBillNo + "'"
                    +",0,0,'',0,'',0"
                    +"," + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",'','称重入库生成','2'"
                    +",0,0,'',0)");
@@ -888,6 +890,11 @@
                        {
                            HRemark = HRemark + "、" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value);
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) == "托盘条码")
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸å…è®¸ä½œåºŸï¼", "提示");
                            return;
                        }
                    }
                    if (HRemark != "")
                    {
@@ -950,6 +957,7 @@
                    string HItemID = "";
                    string HBarCode = "";
                    string HBarCode2 = "";
                    string HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);
                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
                    {
                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
@@ -965,6 +973,17 @@
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("作废标记")].Value) == "")
                        {
                            HRemark = HRemark + "、" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value);
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) == "托盘条码")
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸å…è®¸åä½œåºŸï¼", "提示");
                            return;
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != ""
                            && DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != HBarCode_Pack)
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " å·²ç”Ÿæˆå¯¹åº”组托单，不允许反作废！", "提示");
                            return;
                        }
                    }
                    if (HRemark != "")
@@ -999,7 +1018,7 @@
                        ",HCusID,HDeptID,HCusBarCode,HMulSourceBill) " +
                        " select " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "',HMaterID,HAuxPropID,0" +
                        ",HWhID,0,HSPID,0,0,''" +
                        ",0,HQty,1,HBatchNo,HBarCode,''" +
                        ",0,HQty,1,HBatchNo,HBarCode,HBarCode_Pack" +
                        ",'" + HMaker + "',getdate(),HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo" +
                        ",0,0,'',0,'',0" +
                        ",HSTOCKORGID,HSTOCKORGID,HSTOCKORGID,'','称重入库生成-反作废','2'" +
@@ -1043,6 +1062,229 @@

        #endregion

        #region  //开始组托
        private void cmdHBPack_Click(object sender, EventArgs e)
        {
            if (!PackSub_AllowSave())
            {
                return;
            }
            SavePackBarCode();
            BarCode_Display();
            grdMain.Rows[0].Selected = true;

            txtHBarCode_Pack.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("条码编号")].Value);
            cmdHBPack.Enabled = false;

            sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
            //自动打印
            if (chkHDYFlag.Checked == true)
            {
                //打印条码
                Sub_SetReport("托盘条码");
                Report.Print(false);
                Thread.Sleep(1000);
            }
            else
            {
                //选择打印模板
                BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
                oFrm.sBillName = ModName;
                oFrm.sBillModel = ModCaption;
                oFrm.ShowDialog();
                if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
                {
                    Sub_SetReport(oFrm.sOpenTmp);
                    Report.Print(false);
                    Thread.Sleep(1000);
                }
            }
        }

        //条码生成前判断
        private bool PackSub_AllowSave()
        {
            //判断当前单据ID是否已上传生成单据
            DataSet Ds = oCn.RunProcReturn("select top 1 1 from KF_WeighSource_Temp with(nolock) where HInterID=" + HInterID.ToString() + " and HRelationInterID=1 ", "KF_WeighSource_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
            if (Ds == null || Ds.Tables[0].Rows.Count == 0)
            {
            }
            else
            {
                MessageBox.Show("当前条码记录已换班上传生成单据，请退出后重新进入该模块进行条码生成操作！", "提示");
                return false;
            }

            if (HInterID == 0 || HBillNo == "")
            {
                MessageBox.Show("获取条码对应单据ID或单据号失败，请重新刷新界面！", "提示");
                return false;
            }
            return true;
        }

        //生成托盘条码
        private void SavePackBarCode()
        {
            int LSHlen = 6;             //流水号长度
            Int64 LSH = 0;              //流水号
            string LSH2 = "";           //流水号转换成字符
            string sDate = "";          //日期
            string sYear = "";          //å¹´
            string sPeriod = "";        //月
            string sDay = "";           //日
            string sTMNumber = "";      //条码自定义前缀
            string TM = "";             //条码编号
            DataSet Ds;

            //日期获取方式
            sDate = dtpHDate.Value.ToShortDateString();
            sYear = DBUtility.ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
            sPeriod = "0" + DBUtility.ClsPub.isDate(sDate).Month.ToString();
            sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
            sDay = "0" + DBUtility.ClsPub.isDate(sDate).Day.ToString();
            sDay = sDay.Substring(sDay.Length - 2, 2);
            //==================================
            //条码前缀 = 'TP' + ç»„织代码 + å¹´ + æœˆ + æ—¥
            sTMNumber = "TP" + DBUtility.ClsPub.HOrgNumber + sYear + sPeriod + sDay;
            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
            LSH = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
            LSH = LSH + 1;
            LSH2 = LSH.ToString();
            while (LSH2.Length < LSHlen)  //如果流水号小于6位数前面补0
            {
                LSH2 = "0" + LSH2;
            }
            TM = sTMNumber + LSH2;

            string HBarCode = "";
            string HBarCodeType = "托盘条码";

            HBarCode = TM;
            HBarCodeType = "";

            try
            {
                oCn.BeginTran();
                //写入条码档案
                oCn.RunProc("Insert into Gy_BarCodeBill " +
                "(HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HBarCode_Pack" +
                ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
                ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
                ") Values ("
                + "'" + HBarCode + "','" + HBarCodeType + "',0,0,1,'" + HBarCode + "'"
                + ",'',0,0,'" + HMaker + "',getdate(),0,1"
                + ",0,0,'','',''"
                + ",1,0,0,0,0,''"
                + ", 0,'',getdate(),'','" + sDate + "',0,0,0"
                + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
                + ", " + HProcessExchangeInterID.ToString() + ",0,'',0,'',''"
                + ",'','','',0,'','','1')");

                //回填最大流水号
                oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
                oCn.Commit();
            }
            catch (Exception e)
            {
                oCn.RollBack();
                MessageBox.Show("托盘条码生成失败！" + e.Message);
            }
        }


        #endregion

        #region  //结束组托
        private void cmdHEPack_Click(object sender, EventArgs e)
        {
            string HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);

            //生成组托单前判断
            if(HBarCode_Pack=="")
            {
                MessageBox.Show("请先点击开始组托，进行条码组托操作！", "提示");
                return;
            }
            bool b = false;
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("条码类型")].Value) == "唯一条码"
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack)
                {
                    b = true;
                    break;
                }
            }
            if (b == false)
            {
                MessageBox.Show("当前托盘条码下还没生成对应条码，不允许生成组托单！", "提示");
                return;
            }

            //判断会计期是否合理
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
            {
                MessageBox.Show(s, "提示");
                return;
            }

            try
            {
                oCn.BeginTran();
                //生成生产组托单
                Int64 HPUInterID = DBUtility.ClsPub.CreateBillID_Prod("3783", ref DBUtility.ClsPub.sExeReturnInfo);         //得到最新生产组托单ID
                string HPUBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3783", ref DBUtility.ClsPub.sExeReturnInfo, true); //得到最新生产组托单号

                //写入生产组托单主表
                oCn.RunProc("Insert Into Sc_PackUnionBillMain " +
                    "(HInterID,HBillNo,HBillType,HBillSubType,HDate,HRemark" +
                    ",HYear,HPeriod,HChecker,HCheckDate,HMaker,HMakeDate" +
                    ",HICMOInterID,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HProdOrgID" +
                    ") Values ("
                    + " " + HPUInterID.ToString() + ",'" + HPUBillNo + "','3783','3783',convert(varchar(10),getdate(),120),''"
                    + "," + sYear.ToString() + "," + sPeriod.ToString() + ",'" + HMaker + "',getdate(),'" + HMaker + "',getdate()"
                    + ",0,'','" + HBarCode_Pack + "',0,0," + HStockOrgID.ToString() + ") ");

                //写入生产装箱单子表
                oCn.RunProc("Insert into Sc_PackUnionBillSub " +
                "(HInterID,HEntryID,HRelationQty,HRelationMoney,HRemark" +
                ",HMaterID,HUnitID,HQty,HBarCode,HBarCode_Pack,HScanDate" +
                ",HAuxPropID,HBatchNo,HMTONo" +
                ",HSourceID,HEquipID,HGroupID,HWorkerID,HStatus" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType) " +
                " select " + HPUInterID.ToString() + ",HItemID,'0,0,''" +
                ",HMaterID,HUnitID,HQty,HBarCode,HBarCode_Pack,getdate()" +
                ",HAuxPropID,HBatchNo,HMTONo" +
                ",0,0,0,0,0" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                "from Gy_BarCodeBill with(nolock) where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0"
                );

                MessageBox.Show("生成生产组托单：" + HPUBillNo + " æˆåŠŸï¼", "提示");

                txtHBarCode_Pack.Text = "";
                cmdHBPack.Enabled = true;
                oCn.Commit();
                return;
            }
            catch (Exception e2)
            {
                oCn.RollBack();
                MessageBox.Show("生成生产组托单失败！" + e2.Message);
                return;
            }
        }

        #endregion



@@ -1343,7 +1585,12 @@
                fs.Close();
            }
        }

        #endregion

        #endregion



    }
}

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.designer.cs

@@ -30,8 +30,8 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
            this.Tool = new System.Windows.Forms.ToolStrip();
            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
            this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -55,6 +55,10 @@
            this.label4 = new System.Windows.Forms.Label();
            this.txtHMaterNumber = new System.Windows.Forms.TextBox();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.textBox_COM = new System.Windows.Forms.TextBox();
            this.label_COM = new System.Windows.Forms.Label();
            this.button_OpenCom = new System.Windows.Forms.Button();
            this.button_getHWeight = new System.Windows.Forms.Button();
            this.label17 = new System.Windows.Forms.Label();
            this.txtHOrderPickRemark = new System.Windows.Forms.TextBox();
            this.label15 = new System.Windows.Forms.Label();
@@ -102,10 +106,10 @@
            this.右侧 = new System.Windows.Forms.Panel();
            this.timer2 = new System.Windows.Forms.Timer(this.components);
            this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
            this.button_getHWeight = new System.Windows.Forms.Button();
            this.button_OpenCom = new System.Windows.Forms.Button();
            this.label_COM = new System.Windows.Forms.Label();
            this.textBox_COM = new System.Windows.Forms.TextBox();
            this.cmdHBPack = new System.Windows.Forms.Button();
            this.cmdHEPack = new System.Windows.Forms.Button();
            this.label18 = new System.Windows.Forms.Label();
            this.txtHBarCode_Pack = new System.Windows.Forms.TextBox();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.gbUp.SuspendLayout();
@@ -140,7 +144,7 @@
            this.Tool.Location = new System.Drawing.Point(0, 0);
            this.Tool.Name = "Tool";
            this.Tool.Padding = new System.Windows.Forms.Padding(0);
            this.Tool.Size = new System.Drawing.Size(1924, 75);
            this.Tool.Size = new System.Drawing.Size(1283, 50);
            this.Tool.Stretch = true;
            this.Tool.TabIndex = 16;
            this.Tool.Text = "toolStrip1";
@@ -149,7 +153,7 @@
            // 
            this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator9.Name = "toolStripSeparator9";
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
            // 
            // mrlk
            // 
@@ -159,7 +163,7 @@
            this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
            this.mrlk.Name = "mrlk";
            this.mrlk.Size = new System.Drawing.Size(86, 70);
            this.mrlk.Size = new System.Drawing.Size(60, 47);
            this.mrlk.Text = "默认列宽";
            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -169,7 +173,7 @@
            // 
            this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator7.Name = "toolStripSeparator7";
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
            // 
            // bclk
            // 
@@ -179,7 +183,7 @@
            this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.bclk.ImageTransparentColor = System.Drawing.Color.White;
            this.bclk.Name = "bclk";
            this.bclk.Size = new System.Drawing.Size(86, 70);
            this.bclk.Size = new System.Drawing.Size(60, 47);
            this.bclk.Text = "保存列宽";
            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -189,7 +193,7 @@
            // 
            this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
            // 
            // sx
            // 
@@ -208,7 +212,7 @@
            // toolStripSeparator1
            // 
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
            // 
            // dy
            // 
@@ -227,7 +231,7 @@
            // toolStripSeparator2
            // 
            this.toolStripSeparator2.Name = "toolStripSeparator2";
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
            // 
            // hb
            // 
@@ -246,7 +250,7 @@
            // toolStripSeparator3
            // 
            this.toolStripSeparator3.Name = "toolStripSeparator3";
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
            // 
            // tc
            // 
@@ -265,7 +269,7 @@
            // toolStripSeparator4
            // 
            this.toolStripSeparator4.Name = "toolStripSeparator4";
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 75);
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
            // 
            // timer1
            // 
@@ -278,22 +282,22 @@
            this.grdMain.AllowUserToDeleteRows = false;
            this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdMain.Location = new System.Drawing.Point(4, 4);
            this.grdMain.Location = new System.Drawing.Point(3, 3);
            this.grdMain.Margin = new System.Windows.Forms.Padding(0);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 51;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1472, 508);
            this.grdMain.Size = new System.Drawing.Size(978, 334);
            this.grdMain.TabIndex = 19;
            this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
            // 
@@ -302,10 +306,9 @@
            this.label2.AutoSize = true;
            this.label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label2.ForeColor = System.Drawing.Color.Black;
            this.label2.Location = new System.Drawing.Point(663, 90);
            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label2.Location = new System.Drawing.Point(442, 60);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(80, 18);
            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 49;
            this.label2.Text = "规格型号";
            // 
@@ -313,11 +316,10 @@
            // 
            this.txtHMaterModel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterModel.Location = new System.Drawing.Point(747, 84);
            this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterModel.Location = new System.Drawing.Point(498, 56);
            this.txtHMaterModel.Name = "txtHMaterModel";
            this.txtHMaterModel.ReadOnly = true;
            this.txtHMaterModel.Size = new System.Drawing.Size(190, 28);
            this.txtHMaterModel.Size = new System.Drawing.Size(128, 21);
            this.txtHMaterModel.TabIndex = 50;
            // 
            // label3
@@ -325,10 +327,9 @@
            this.label3.AutoSize = true;
            this.label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label3.ForeColor = System.Drawing.Color.Black;
            this.label3.Location = new System.Drawing.Point(94, 222);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(63, 148);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(44, 18);
            this.label3.Size = new System.Drawing.Size(29, 12);
            this.label3.TabIndex = 52;
            this.label3.Text = "备注";
            // 
@@ -336,10 +337,9 @@
            // 
            this.txtHRemark.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHRemark.Location = new System.Drawing.Point(142, 216);
            this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHRemark.Location = new System.Drawing.Point(95, 144);
            this.txtHRemark.Name = "txtHRemark";
            this.txtHRemark.Size = new System.Drawing.Size(1056, 28);
            this.txtHRemark.Size = new System.Drawing.Size(705, 21);
            this.txtHRemark.TabIndex = 53;
            // 
            // label4
@@ -347,10 +347,9 @@
            this.label4.AutoSize = true;
            this.label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label4.ForeColor = System.Drawing.Color.Black;
            this.label4.Location = new System.Drawing.Point(58, 90);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(39, 60);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(80, 18);
            this.label4.Size = new System.Drawing.Size(53, 12);
            this.label4.TabIndex = 55;
            this.label4.Text = "物料代码";
            // 
@@ -358,16 +357,19 @@
            // 
            this.txtHMaterNumber.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterNumber.Location = new System.Drawing.Point(142, 84);
            this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterNumber.Location = new System.Drawing.Point(95, 56);
            this.txtHMaterNumber.Name = "txtHMaterNumber";
            this.txtHMaterNumber.ReadOnly = true;
            this.txtHMaterNumber.Size = new System.Drawing.Size(190, 28);
            this.txtHMaterNumber.Size = new System.Drawing.Size(128, 21);
            this.txtHMaterNumber.TabIndex = 56;
            // 
            // gbUp
            // 
            this.gbUp.BackColor = System.Drawing.Color.Transparent;
            this.gbUp.Controls.Add(this.label18);
            this.gbUp.Controls.Add(this.txtHBarCode_Pack);
            this.gbUp.Controls.Add(this.cmdHEPack);
            this.gbUp.Controls.Add(this.cmdHBPack);
            this.gbUp.Controls.Add(this.textBox_COM);
            this.gbUp.Controls.Add(this.label_COM);
            this.gbUp.Controls.Add(this.button_OpenCom);
@@ -412,22 +414,65 @@
            this.gbUp.Controls.Add(this.label2);
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Size = new System.Drawing.Size(1488, 392);
            this.gbUp.Size = new System.Drawing.Size(992, 261);
            this.gbUp.TabIndex = 58;
            this.gbUp.TabStop = false;
            // 
            // textBox_COM
            // 
            this.textBox_COM.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.textBox_COM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.textBox_COM.Location = new System.Drawing.Point(498, 112);
            this.textBox_COM.Name = "textBox_COM";
            this.textBox_COM.Size = new System.Drawing.Size(128, 21);
            this.textBox_COM.TabIndex = 329;
            // 
            // label_COM
            // 
            this.label_COM.AutoSize = true;
            this.label_COM.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label_COM.ForeColor = System.Drawing.Color.Black;
            this.label_COM.Location = new System.Drawing.Point(472, 116);
            this.label_COM.Name = "label_COM";
            this.label_COM.Size = new System.Drawing.Size(23, 12);
            this.label_COM.TabIndex = 328;
            this.label_COM.Text = "COM";
            // 
            // button_OpenCom
            // 
            this.button_OpenCom.BackColor = System.Drawing.Color.White;
            this.button_OpenCom.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_OpenCom.Location = new System.Drawing.Point(429, 222);
            this.button_OpenCom.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.button_OpenCom.Name = "button_OpenCom";
            this.button_OpenCom.Size = new System.Drawing.Size(86, 32);
            this.button_OpenCom.TabIndex = 327;
            this.button_OpenCom.Text = "打开串口";
            this.button_OpenCom.UseVisualStyleBackColor = false;
            this.button_OpenCom.Click += new System.EventHandler(this.button_OpenCom_Click);
            // 
            // button_getHWeight
            // 
            this.button_getHWeight.BackColor = System.Drawing.Color.White;
            this.button_getHWeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_getHWeight.Location = new System.Drawing.Point(322, 222);
            this.button_getHWeight.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.button_getHWeight.Name = "button_getHWeight";
            this.button_getHWeight.Size = new System.Drawing.Size(86, 32);
            this.button_getHWeight.TabIndex = 326;
            this.button_getHWeight.Text = "称重";
            this.button_getHWeight.UseVisualStyleBackColor = false;
            this.button_getHWeight.Click += new System.EventHandler(this.button_getHWeight_Click);
            // 
            // label17
            // 
            this.label17.AutoSize = true;
            this.label17.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label17.ForeColor = System.Drawing.Color.Black;
            this.label17.Location = new System.Drawing.Point(22, 266);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Location = new System.Drawing.Point(15, 177);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(116, 18);
            this.label17.Size = new System.Drawing.Size(77, 12);
            this.label17.TabIndex = 324;
            this.label17.Text = "订单包装备注";
            // 
@@ -437,13 +482,12 @@
            this.txtHOrderPickRemark.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHOrderPickRemark.ForeColor = System.Drawing.Color.Red;
            this.txtHOrderPickRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHOrderPickRemark.Location = new System.Drawing.Point(142, 260);
            this.txtHOrderPickRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHOrderPickRemark.Location = new System.Drawing.Point(95, 173);
            this.txtHOrderPickRemark.Multiline = true;
            this.txtHOrderPickRemark.Name = "txtHOrderPickRemark";
            this.txtHOrderPickRemark.ReadOnly = true;
            this.txtHOrderPickRemark.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
            this.txtHOrderPickRemark.Size = new System.Drawing.Size(1087, 64);
            this.txtHOrderPickRemark.Size = new System.Drawing.Size(726, 44);
            this.txtHOrderPickRemark.TabIndex = 325;
            // 
            // label15
@@ -451,10 +495,9 @@
            this.label15.AutoSize = true;
            this.label15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label15.ForeColor = System.Drawing.Color.Black;
            this.label15.Location = new System.Drawing.Point(336, 174);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Location = new System.Drawing.Point(224, 116);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(116, 18);
            this.label15.Size = new System.Drawing.Size(77, 12);
            this.label15.TabIndex = 322;
            this.label15.Text = "客户规格型号";
            // 
@@ -462,11 +505,10 @@
            // 
            this.txtHCusModel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHCusModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCusModel.Location = new System.Drawing.Point(454, 168);
            this.txtHCusModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHCusModel.Location = new System.Drawing.Point(303, 112);
            this.txtHCusModel.Name = "txtHCusModel";
            this.txtHCusModel.ReadOnly = true;
            this.txtHCusModel.Size = new System.Drawing.Size(190, 28);
            this.txtHCusModel.Size = new System.Drawing.Size(128, 21);
            this.txtHCusModel.TabIndex = 323;
            // 
            // label16
@@ -474,10 +516,9 @@
            this.label16.AutoSize = true;
            this.label16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label16.ForeColor = System.Drawing.Color.Black;
            this.label16.Location = new System.Drawing.Point(22, 174);
            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label16.Location = new System.Drawing.Point(15, 116);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(116, 18);
            this.label16.Size = new System.Drawing.Size(77, 12);
            this.label16.TabIndex = 320;
            this.label16.Text = "客户物料名称";
            // 
@@ -485,11 +526,10 @@
            // 
            this.txtHCusMaterName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHCusMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCusMaterName.Location = new System.Drawing.Point(142, 168);
            this.txtHCusMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHCusMaterName.Location = new System.Drawing.Point(95, 112);
            this.txtHCusMaterName.Name = "txtHCusMaterName";
            this.txtHCusMaterName.ReadOnly = true;
            this.txtHCusMaterName.Size = new System.Drawing.Size(190, 28);
            this.txtHCusMaterName.Size = new System.Drawing.Size(128, 21);
            this.txtHCusMaterName.TabIndex = 321;
            // 
            // label13
@@ -497,10 +537,9 @@
            this.label13.AutoSize = true;
            this.label13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label13.ForeColor = System.Drawing.Color.Black;
            this.label13.Location = new System.Drawing.Point(993, 132);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(662, 88);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(44, 18);
            this.label13.Size = new System.Drawing.Size(29, 12);
            this.label13.TabIndex = 318;
            this.label13.Text = "包号";
            // 
@@ -508,10 +547,9 @@
            // 
            this.txtHBarcodeNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarcodeNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarcodeNo.Location = new System.Drawing.Point(1040, 126);
            this.txtHBarcodeNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBarcodeNo.Location = new System.Drawing.Point(693, 84);
            this.txtHBarcodeNo.Name = "txtHBarcodeNo";
            this.txtHBarcodeNo.Size = new System.Drawing.Size(190, 28);
            this.txtHBarcodeNo.Size = new System.Drawing.Size(128, 21);
            this.txtHBarcodeNo.TabIndex = 319;
            // 
            // cmdHBadReasonID
@@ -519,10 +557,9 @@
            this.cmdHBadReasonID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHBadReasonID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadReasonID.Image")));
            this.cmdHBadReasonID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHBadReasonID.Location = new System.Drawing.Point(1198, 214);
            this.cmdHBadReasonID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHBadReasonID.Location = new System.Drawing.Point(799, 143);
            this.cmdHBadReasonID.Name = "cmdHBadReasonID";
            this.cmdHBadReasonID.Size = new System.Drawing.Size(33, 33);
            this.cmdHBadReasonID.Size = new System.Drawing.Size(22, 22);
            this.cmdHBadReasonID.TabIndex = 317;
            this.cmdHBadReasonID.UseVisualStyleBackColor = false;
            this.cmdHBadReasonID.Click += new System.EventHandler(this.cmdHBadReasonID_Click);
@@ -530,9 +567,10 @@
            // chkHDYFlag
            // 
            this.chkHDYFlag.AutoSize = true;
            this.chkHDYFlag.Location = new System.Drawing.Point(837, 354);
            this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.chkHDYFlag.Name = "chkHDYFlag";
            this.chkHDYFlag.Size = new System.Drawing.Size(106, 22);
            this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
            this.chkHDYFlag.TabIndex = 316;
            this.chkHDYFlag.Text = "自动打印";
            this.chkHDYFlag.UseVisualStyleBackColor = true;
@@ -541,9 +579,10 @@
            // 
            this.cmdFZF.BackColor = System.Drawing.Color.White;
            this.cmdFZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdFZF.Location = new System.Drawing.Point(1094, 333);
            this.cmdFZF.Location = new System.Drawing.Point(729, 222);
            this.cmdFZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdFZF.Name = "cmdFZF";
            this.cmdFZF.Size = new System.Drawing.Size(129, 48);
            this.cmdFZF.Size = new System.Drawing.Size(86, 32);
            this.cmdFZF.TabIndex = 157;
            this.cmdFZF.Text = "反作废";
            this.cmdFZF.UseVisualStyleBackColor = false;
@@ -553,9 +592,10 @@
            // 
            this.cmdZF.BackColor = System.Drawing.Color.White;
            this.cmdZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdZF.Location = new System.Drawing.Point(952, 333);
            this.cmdZF.Location = new System.Drawing.Point(635, 222);
            this.cmdZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdZF.Name = "cmdZF";
            this.cmdZF.Size = new System.Drawing.Size(129, 48);
            this.cmdZF.Size = new System.Drawing.Size(86, 32);
            this.cmdZF.TabIndex = 156;
            this.cmdZF.Text = "作废";
            this.cmdZF.UseVisualStyleBackColor = false;
@@ -565,11 +605,10 @@
            // 
            this.txtHDeptName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHDeptName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHDeptName.Location = new System.Drawing.Point(747, 42);
            this.txtHDeptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHDeptName.Location = new System.Drawing.Point(498, 28);
            this.txtHDeptName.Name = "txtHDeptName";
            this.txtHDeptName.ReadOnly = true;
            this.txtHDeptName.Size = new System.Drawing.Size(190, 28);
            this.txtHDeptName.Size = new System.Drawing.Size(128, 21);
            this.txtHDeptName.TabIndex = 155;
            // 
            // label12
@@ -577,10 +616,9 @@
            this.label12.AutoSize = true;
            this.label12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label12.ForeColor = System.Drawing.Color.Black;
            this.label12.Location = new System.Drawing.Point(699, 48);
            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label12.Location = new System.Drawing.Point(466, 32);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(44, 18);
            this.label12.Size = new System.Drawing.Size(29, 12);
            this.label12.TabIndex = 154;
            this.label12.Text = "车间";
            // 
@@ -588,11 +626,10 @@
            // 
            this.txtHBatchNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBatchNo.Location = new System.Drawing.Point(1040, 84);
            this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBatchNo.Location = new System.Drawing.Point(693, 56);
            this.txtHBatchNo.Name = "txtHBatchNo";
            this.txtHBatchNo.ReadOnly = true;
            this.txtHBatchNo.Size = new System.Drawing.Size(190, 28);
            this.txtHBatchNo.Size = new System.Drawing.Size(128, 21);
            this.txtHBatchNo.TabIndex = 153;
            // 
            // label11
@@ -600,10 +637,9 @@
            this.label11.AutoSize = true;
            this.label11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label11.ForeColor = System.Drawing.Color.Black;
            this.label11.Location = new System.Drawing.Point(993, 90);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(662, 60);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(44, 18);
            this.label11.Size = new System.Drawing.Size(29, 12);
            this.label11.TabIndex = 152;
            this.label11.Text = "批号";
            // 
@@ -612,10 +648,9 @@
            this.label10.AutoSize = true;
            this.label10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label10.ForeColor = System.Drawing.Color.Black;
            this.label10.Location = new System.Drawing.Point(681, 132);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(454, 88);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(62, 18);
            this.label10.Size = new System.Drawing.Size(41, 12);
            this.label10.TabIndex = 150;
            this.label10.Text = "扣点数";
            // 
@@ -623,10 +658,9 @@
            // 
            this.txtHKDQty.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHKDQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHKDQty.Location = new System.Drawing.Point(747, 126);
            this.txtHKDQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHKDQty.Location = new System.Drawing.Point(498, 84);
            this.txtHKDQty.Name = "txtHKDQty";
            this.txtHKDQty.Size = new System.Drawing.Size(190, 28);
            this.txtHKDQty.Size = new System.Drawing.Size(128, 21);
            this.txtHKDQty.TabIndex = 151;
            // 
            // label9
@@ -634,10 +668,9 @@
            this.label9.AutoSize = true;
            this.label9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label9.ForeColor = System.Drawing.Color.Black;
            this.label9.Location = new System.Drawing.Point(408, 132);
            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label9.Location = new System.Drawing.Point(272, 88);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(44, 18);
            this.label9.Size = new System.Drawing.Size(29, 12);
            this.label9.TabIndex = 148;
            this.label9.Text = "重量";
            // 
@@ -645,10 +678,9 @@
            // 
            this.txtHWeightQyt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHWeightQyt.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHWeightQyt.Location = new System.Drawing.Point(454, 126);
            this.txtHWeightQyt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHWeightQyt.Location = new System.Drawing.Point(303, 84);
            this.txtHWeightQyt.Name = "txtHWeightQyt";
            this.txtHWeightQyt.Size = new System.Drawing.Size(190, 28);
            this.txtHWeightQyt.Size = new System.Drawing.Size(128, 21);
            this.txtHWeightQyt.TabIndex = 149;
            // 
            // label7
@@ -656,10 +688,9 @@
            this.label7.AutoSize = true;
            this.label7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label7.ForeColor = System.Drawing.Color.Black;
            this.label7.Location = new System.Drawing.Point(94, 132);
            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label7.Location = new System.Drawing.Point(63, 88);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(44, 18);
            this.label7.Size = new System.Drawing.Size(29, 12);
            this.label7.TabIndex = 146;
            this.label7.Text = "米数";
            // 
@@ -667,10 +698,9 @@
            // 
            this.txtHQty.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHQty.Location = new System.Drawing.Point(142, 126);
            this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHQty.Location = new System.Drawing.Point(95, 84);
            this.txtHQty.Name = "txtHQty";
            this.txtHQty.Size = new System.Drawing.Size(190, 28);
            this.txtHQty.Size = new System.Drawing.Size(128, 21);
            this.txtHQty.TabIndex = 147;
            // 
            // label14
@@ -678,10 +708,9 @@
            this.label14.AutoSize = true;
            this.label14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label14.ForeColor = System.Drawing.Color.Black;
            this.label14.Location = new System.Drawing.Point(372, 90);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(248, 60);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(80, 18);
            this.label14.Size = new System.Drawing.Size(53, 12);
            this.label14.TabIndex = 144;
            this.label14.Text = "物料名称";
            // 
@@ -689,20 +718,20 @@
            // 
            this.txtHMaterName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterName.Location = new System.Drawing.Point(454, 84);
            this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterName.Location = new System.Drawing.Point(303, 56);
            this.txtHMaterName.Name = "txtHMaterName";
            this.txtHMaterName.ReadOnly = true;
            this.txtHMaterName.Size = new System.Drawing.Size(190, 28);
            this.txtHMaterName.Size = new System.Drawing.Size(128, 21);
            this.txtHMaterName.TabIndex = 145;
            // 
            // cmdSave
            // 
            this.cmdSave.BackColor = System.Drawing.Color.White;
            this.cmdSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSave.Location = new System.Drawing.Point(314, 333);
            this.cmdSave.Location = new System.Drawing.Point(209, 222);
            this.cmdSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdSave.Name = "cmdSave";
            this.cmdSave.Size = new System.Drawing.Size(129, 48);
            this.cmdSave.Size = new System.Drawing.Size(86, 32);
            this.cmdSave.TabIndex = 139;
            this.cmdSave.Text = "保存";
            this.cmdSave.UseVisualStyleBackColor = false;
@@ -713,10 +742,9 @@
            this.label5.AutoSize = true;
            this.label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label5.ForeColor = System.Drawing.Color.Black;
            this.label5.Location = new System.Drawing.Point(76, 48);
            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label5.Location = new System.Drawing.Point(51, 32);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(62, 18);
            this.label5.Size = new System.Drawing.Size(41, 12);
            this.label5.TabIndex = 142;
            this.label5.Text = "单据号";
            // 
@@ -724,9 +752,10 @@
            // 
            this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
            this.cmdSourceBillNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSourceBillNo.Location = new System.Drawing.Point(153, 333);
            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
            this.cmdSourceBillNo.Size = new System.Drawing.Size(129, 48);
            this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
            this.cmdSourceBillNo.TabIndex = 138;
            this.cmdSourceBillNo.Text = "选单";
            this.cmdSourceBillNo.UseVisualStyleBackColor = false;
@@ -736,11 +765,10 @@
            // 
            this.txtHBillNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBillNo.Location = new System.Drawing.Point(142, 42);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBillNo.Location = new System.Drawing.Point(95, 28);
            this.txtHBillNo.Name = "txtHBillNo";
            this.txtHBillNo.ReadOnly = true;
            this.txtHBillNo.Size = new System.Drawing.Size(190, 28);
            this.txtHBillNo.Size = new System.Drawing.Size(128, 21);
            this.txtHBillNo.TabIndex = 143;
            // 
            // cmbHBarCodeType
@@ -749,9 +777,10 @@
            this.cmbHBarCodeType.FormattingEnabled = true;
            this.cmbHBarCodeType.Items.AddRange(new object[] {
            "唯一条码"});
            this.cmbHBarCodeType.Location = new System.Drawing.Point(1040, 42);
            this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(190, 26);
            this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
            this.cmbHBarCodeType.TabIndex = 139;
            // 
            // label8
@@ -759,10 +788,9 @@
            this.label8.AutoSize = true;
            this.label8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label8.ForeColor = System.Drawing.Color.Black;
            this.label8.Location = new System.Drawing.Point(957, 48);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(638, 32);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(80, 18);
            this.label8.Size = new System.Drawing.Size(53, 12);
            this.label8.TabIndex = 138;
            this.label8.Text = "条码类型";
            // 
@@ -770,9 +798,10 @@
            // 
            this.dtpHDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
            this.dtpHDate.Location = new System.Drawing.Point(454, 42);
            this.dtpHDate.Location = new System.Drawing.Point(303, 28);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.dtpHDate.Name = "dtpHDate";
            this.dtpHDate.Size = new System.Drawing.Size(190, 28);
            this.dtpHDate.Size = new System.Drawing.Size(128, 21);
            this.dtpHDate.TabIndex = 100;
            // 
            // label6
@@ -780,10 +809,9 @@
            this.label6.AutoSize = true;
            this.label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label6.ForeColor = System.Drawing.Color.Black;
            this.label6.Location = new System.Drawing.Point(408, 48);
            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label6.Location = new System.Drawing.Point(272, 32);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(44, 18);
            this.label6.Size = new System.Drawing.Size(29, 12);
            this.label6.TabIndex = 99;
            this.label6.Text = "日期";
            // 
@@ -793,22 +821,22 @@
            this.grdSub.AllowUserToDeleteRows = false;
            this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.Location = new System.Drawing.Point(0, 110);
            this.grdSub.Location = new System.Drawing.Point(0, 73);
            this.grdSub.Margin = new System.Windows.Forms.Padding(0);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 23;
            this.grdSub.Size = new System.Drawing.Size(386, 830);
            this.grdSub.Size = new System.Drawing.Size(257, 554);
            this.grdSub.TabIndex = 18;
            this.grdSub.Paint += new System.Windows.Forms.PaintEventHandler(this.grdSub_Paint);
            // 
@@ -816,21 +844,19 @@
            // 
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl1.Location = new System.Drawing.Point(0, 392);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabControl1.Location = new System.Drawing.Point(0, 261);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1488, 548);
            this.tabControl1.Size = new System.Drawing.Size(992, 366);
            this.tabControl1.TabIndex = 149;
            // 
            // tabPage1
            // 
            this.tabPage1.Controls.Add(this.grdMain);
            this.tabPage1.Location = new System.Drawing.Point(4, 28);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Size = new System.Drawing.Size(1480, 516);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage1.Size = new System.Drawing.Size(984, 340);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "称重记录";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -840,10 +866,9 @@
            this.panel1.Controls.Add(this.grdSub);
            this.panel1.Controls.Add(this.groupBox1);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
            this.panel1.Location = new System.Drawing.Point(16, 75);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel1.Location = new System.Drawing.Point(11, 50);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(386, 940);
            this.panel1.Size = new System.Drawing.Size(257, 627);
            this.panel1.TabIndex = 59;
            // 
            // groupBox1
@@ -853,10 +878,8 @@
            this.groupBox1.Controls.Add(this.cmdOK);
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
            this.groupBox1.Location = new System.Drawing.Point(0, 0);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.groupBox1.Size = new System.Drawing.Size(386, 110);
            this.groupBox1.Size = new System.Drawing.Size(257, 73);
            this.groupBox1.TabIndex = 146;
            this.groupBox1.TabStop = false;
            // 
@@ -865,10 +888,9 @@
            this.label1.AutoSize = true;
            this.label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label1.ForeColor = System.Drawing.Color.Black;
            this.label1.Location = new System.Drawing.Point(16, 60);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(11, 40);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(62, 18);
            this.label1.Size = new System.Drawing.Size(41, 12);
            this.label1.TabIndex = 151;
            this.label1.Text = "条形码";
            // 
@@ -876,10 +898,9 @@
            // 
            this.txtHBarCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode.Location = new System.Drawing.Point(86, 54);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBarCode.Location = new System.Drawing.Point(57, 36);
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(188, 28);
            this.txtHBarCode.Size = new System.Drawing.Size(127, 21);
            this.txtHBarCode.TabIndex = 152;
            this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
            // 
@@ -888,9 +909,10 @@
            this.cmdOK.BackColor = System.Drawing.Color.White;
            this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
            this.cmdOK.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdOK.Location = new System.Drawing.Point(284, 50);
            this.cmdOK.Location = new System.Drawing.Point(189, 33);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(82, 40);
            this.cmdOK.Size = new System.Drawing.Size(55, 27);
            this.cmdOK.TabIndex = 150;
            this.cmdOK.Text = "确认";
            this.cmdOK.UseVisualStyleBackColor = false;
@@ -901,105 +923,101 @@
            this.panel2.Controls.Add(this.tabControl1);
            this.panel2.Controls.Add(this.gbUp);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.panel2.Location = new System.Drawing.Point(418, 75);
            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel2.Location = new System.Drawing.Point(279, 50);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1488, 940);
            this.panel2.Size = new System.Drawing.Size(992, 627);
            this.panel2.TabIndex = 60;
            // 
            // å·¦ä¾§
            // 
            this.左侧.Dock = System.Windows.Forms.DockStyle.Left;
            this.左侧.Location = new System.Drawing.Point(0, 75);
            this.左侧.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.左侧.Location = new System.Drawing.Point(0, 50);
            this.左侧.Name = "左侧";
            this.左侧.Size = new System.Drawing.Size(16, 940);
            this.左侧.Size = new System.Drawing.Size(11, 627);
            this.左侧.TabIndex = 61;
            // 
            // ä¸­é—´
            // 
            this.中间.Dock = System.Windows.Forms.DockStyle.Left;
            this.中间.Location = new System.Drawing.Point(402, 75);
            this.中间.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.中间.Location = new System.Drawing.Point(268, 50);
            this.中间.Name = "中间";
            this.中间.Size = new System.Drawing.Size(16, 940);
            this.中间.Size = new System.Drawing.Size(11, 627);
            this.中间.TabIndex = 62;
            // 
            // åº•éƒ¨
            // 
            this.底部.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.底部.Location = new System.Drawing.Point(0, 1015);
            this.底部.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.底部.Location = new System.Drawing.Point(0, 677);
            this.底部.Name = "底部";
            this.底部.Size = new System.Drawing.Size(1924, 15);
            this.底部.Size = new System.Drawing.Size(1283, 10);
            this.底部.TabIndex = 63;
            // 
            // å³ä¾§
            // 
            this.右侧.Dock = System.Windows.Forms.DockStyle.Right;
            this.右侧.Location = new System.Drawing.Point(1906, 75);
            this.右侧.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.右侧.Location = new System.Drawing.Point(1271, 50);
            this.右侧.Name = "右侧";
            this.右侧.Size = new System.Drawing.Size(18, 940);
            this.右侧.Size = new System.Drawing.Size(12, 627);
            this.右侧.TabIndex = 64;
            // 
            // timer2
            // 
            this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
            // 
            // button_getHWeight
            // cmdHBPack
            // 
            this.button_getHWeight.BackColor = System.Drawing.Color.White;
            this.button_getHWeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_getHWeight.Location = new System.Drawing.Point(483, 333);
            this.button_getHWeight.Name = "button_getHWeight";
            this.button_getHWeight.Size = new System.Drawing.Size(129, 48);
            this.button_getHWeight.TabIndex = 326;
            this.button_getHWeight.Text = "称重";
            this.button_getHWeight.UseVisualStyleBackColor = false;
            this.button_getHWeight.Click += new System.EventHandler(this.button_getHWeight_Click);
            this.cmdHBPack.BackColor = System.Drawing.Color.White;
            this.cmdHBPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHBPack.Location = new System.Drawing.Point(847, 40);
            this.cmdHBPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHBPack.Name = "cmdHBPack";
            this.cmdHBPack.Size = new System.Drawing.Size(86, 32);
            this.cmdHBPack.TabIndex = 330;
            this.cmdHBPack.Text = "开始组托";
            this.cmdHBPack.UseVisualStyleBackColor = false;
            this.cmdHBPack.Click += new System.EventHandler(this.cmdHBPack_Click);
            // 
            // button_OpenCom
            // cmdHEPack
            // 
            this.button_OpenCom.BackColor = System.Drawing.Color.White;
            this.button_OpenCom.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_OpenCom.Location = new System.Drawing.Point(644, 333);
            this.button_OpenCom.Name = "button_OpenCom";
            this.button_OpenCom.Size = new System.Drawing.Size(129, 48);
            this.button_OpenCom.TabIndex = 327;
            this.button_OpenCom.Text = "打开串口";
            this.button_OpenCom.UseVisualStyleBackColor = false;
            this.button_OpenCom.Click += new System.EventHandler(this.button_OpenCom_Click);
            this.cmdHEPack.BackColor = System.Drawing.Color.White;
            this.cmdHEPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHEPack.Location = new System.Drawing.Point(847, 94);
            this.cmdHEPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHEPack.Name = "cmdHEPack";
            this.cmdHEPack.Size = new System.Drawing.Size(86, 32);
            this.cmdHEPack.TabIndex = 331;
            this.cmdHEPack.Text = "结束组托";
            this.cmdHEPack.UseVisualStyleBackColor = false;
            this.cmdHEPack.Click += new System.EventHandler(this.cmdHEPack_Click);
            // 
            // label_COM
            // label18
            // 
            this.label_COM.AutoSize = true;
            this.label_COM.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label_COM.ForeColor = System.Drawing.Color.Black;
            this.label_COM.Location = new System.Drawing.Point(708, 171);
            this.label_COM.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label_COM.Name = "label_COM";
            this.label_COM.Size = new System.Drawing.Size(35, 18);
            this.label_COM.TabIndex = 328;
            this.label_COM.Text = "COM";
            this.label18.AutoSize = true;
            this.label18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label18.ForeColor = System.Drawing.Color.Black;
            this.label18.Location = new System.Drawing.Point(638, 116);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(53, 12);
            this.label18.TabIndex = 332;
            this.label18.Text = "托盘条码";
            // 
            // textBox_COM
            // txtHBarCode_Pack
            // 
            this.textBox_COM.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.textBox_COM.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.textBox_COM.Location = new System.Drawing.Point(747, 168);
            this.textBox_COM.Margin = new System.Windows.Forms.Padding(4);
            this.textBox_COM.Name = "textBox_COM";
            this.textBox_COM.Size = new System.Drawing.Size(190, 28);
            this.textBox_COM.TabIndex = 329;
            this.txtHBarCode_Pack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode_Pack.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode_Pack.Location = new System.Drawing.Point(693, 112);
            this.txtHBarCode_Pack.Name = "txtHBarCode_Pack";
            this.txtHBarCode_Pack.ReadOnly = true;
            this.txtHBarCode_Pack.Size = new System.Drawing.Size(128, 21);
            this.txtHBarCode_Pack.TabIndex = 333;
            // 
            // Kf_WeighToBarCode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.AutoSize = true;
            this.BackColor = System.Drawing.SystemColors.ActiveCaption;
            this.ClientSize = new System.Drawing.Size(1924, 1030);
            this.ClientSize = new System.Drawing.Size(1283, 687);
            this.Controls.Add(this.panel2);
            this.Controls.Add(this.中间);
            this.Controls.Add(this.panel1);
@@ -1007,7 +1025,6 @@
            this.Controls.Add(this.右侧);
            this.Controls.Add(this.底部);
            this.Controls.Add(this.Tool);
            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.Name = "Kf_WeighToBarCode";
            this.Text = "称重入库";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1103,5 +1120,9 @@
        private System.Windows.Forms.Button button_OpenCom;
        private System.Windows.Forms.TextBox textBox_COM;
        private System.Windows.Forms.Label label_COM;
        private System.Windows.Forms.Button cmdHEPack;
        private System.Windows.Forms.Button cmdHBPack;
        private System.Windows.Forms.Label label18;
        private System.Windows.Forms.TextBox txtHBarCode_Pack;
    }
}

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.resx

@@ -360,7 +360,7 @@
  <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
        znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
        vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -375,7 +375,7 @@
  <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
        77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
        aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -390,7 +390,7 @@
  <data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
        EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
        M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
        JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
@@ -402,7 +402,7 @@
  <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -412,7 +412,7 @@
  <data name="hb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
        d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
        hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
        M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -425,7 +425,7 @@
  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
        rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
        wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1587,7 +1587,7 @@
                    return objJsonResult;
                }

                string sql1 = "select top 5000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql1 = "select top 15000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");

@@ -2036,6 +2036,30 @@
                string HMouldClass = mainList[0].HMouldClass;
                int HNowWHID = mainList[0].HNowWHID;
                int HNowSPID = mainList[0].HNowSPID;
                string HMouldUseStatus = mainList[0].HMouldUseStatus;

                //保存前控制=========================================
                string HBillNote = "";
                ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //=========================================================


                //主表
                oCN.RunProc("Insert Into Gy_MouldFileMain   " +
@@ -2048,7 +2072,7 @@
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife) " +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus) " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -2058,7 +2082,7 @@
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "') ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2070,6 +2094,29 @@
                ") ");

                objJsonResult = AddBillSub(msg5,msg6,msg7,HInterID, HBillNo);

                //保存后控制=========================================
                ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                //=========================================================


                if (objJsonResult.code == "0")
                {
@@ -2185,7 +2232,7 @@
                string HMouldClass = mainList[0].HMouldClass;
                int HNowWHID = mainList[0].HNowWHID;
                int HNowSPID = mainList[0].HNowSPID;

                string HMouldUseStatus = mainList[0].HMouldUseStatus;
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -2242,6 +2289,7 @@
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                ",HInitLife='" + HInitLife +
                "',HMouldUseStatus='" + HMouldUseStatus +
                "' where HInterID=" + HInterID.ToString());

                //修改子项目代码

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1715,6 +1715,93 @@
        }
        #endregion

        #region è¿”回工序出站汇报单列表     20240926新增
        [Route("Cj_StationOutBillController/GetSc_StationOutBillList_Json")]
        [HttpGet]
        public object GetSc_StationOutBillList_Json(string sWhere, string HMaker, string HBillSubType, string OperationType, string ViewName)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                if (HBillSubType == "SUB")
                {
                    //判断是否有查询权限
                    if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, HMaker))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "完工单无查询权限!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if(OperationType == "1")
                {
                    //判断是否有查询权限
                    if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, HMaker))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "出站单无查询权限!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

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

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

                //返回列表信息
                ds = oCN.RunProcReturn("select * from " + ViewName + " where 1=1 " + sWhere + " order by hmainid desc", ViewName);

                //添加列名
                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 = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥åºå‡ºç«™æ±‡æŠ¥å• å­è¡¨æŸ¥è¯¢
        [Route("Cj_StationOutBill/get_SubDisplay")]
        [HttpGet]

 WebAPI/Controllers/CJGL/Gy_MaterPreventErrMouldBillController.cs

@@ -23,6 +23,63 @@
        public DAL.ClsGy_MaterPreventErrMouldBillMain BillOld = new DAL.ClsGy_MaterPreventErrMouldBillMain();


        #region äº§å“é˜²é”™éªŒè¯æ¸…单列表 æŸ¥è¯¢ åªæ˜¾ç¤ºä¸»è¡¨      
        [Route("Gy_MaterPreventErrMouldBill/getGy_MaterPreventErrMouldBillMainList_Main")]
        [HttpGet]
        public object getGy_MaterPreventErrMouldBillMainList_Main(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_MaterPreventErrMouldBillMain_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MaterPreventErrMouldBillMainList_Main order by å•æ®å· desc", "h_v_Gy_MaterPreventErrMouldBillMainList_Main");
                }
                else
                {
                    string sql1 = "select * from  h_v_Gy_MaterPreventErrMouldBillMainList_Main  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterPreventErrMouldBillMainList_Main");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region äº§å“é˜²é”™éªŒè¯æ¸…单列表 æŸ¥è¯¢       
        [Route("Gy_MaterPreventErrMouldBill/getGy_MaterPreventErrMouldBillMainList")]
        [HttpGet]

 WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs

@@ -343,7 +343,6 @@
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();

            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
@@ -365,7 +364,7 @@
                lsmain = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillMain(msg2);
                foreach (Model.ClsSc_MouldMaintainRuleBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    DBUtility.ClsPub.CurUserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3833";
                    oItem.HBillSubType = "3833";


 WebAPI/Controllers/MJGL/Sc_MouldReportController.cs

@@ -233,5 +233,54 @@
        }
        #endregion

        #region  æ¨¡å…·ä¿å…»é€¾æœŸé¢„警报表
        [Route("Sc_MouldRepairCheckTaskReport/Sc_MoldMainoverdueWarnReport")]
        [HttpGet]
        public object Sc_MoldMainoverdueWarnReport(string HMouldTypeID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_Sc_MoldMainoverdueWarnReport " + HMouldTypeID, "h_p_Sc_MoldMainoverdueWarnReport");

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                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 = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs

@@ -1649,7 +1649,7 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("exec h_p_Sc_AllowLoadData '" + HBarCode + "','"+ HSourceID + "'", "h_p_Sc_AllowLoadData");
                ds = oCN.RunProcReturn("exec h_p_Sc_AllowLoadData '" + HBarCode + "','"+ HSourceID + "','"+ HBillType + "'", "h_p_Sc_AllowLoadData");

                if (ds == null || ds .Tables.Count== 0 || ds.Tables[0].Rows.Count == 0)
                {
@@ -1660,6 +1660,15 @@
                    return objJsonResult;
                }

                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -323,6 +323,27 @@
                }
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //保存前控制=========================================
                string HBillNote = "";
                ds = oCN.RunProcReturn("Exec h_p_Gy_EquipFileBillMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + hbillno + "','" + HBillNote + "',1 ", "h_p_Gy_EquipFileBillMain_BeforeSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //=========================================================
                //主表
                oCN.RunProc("Insert into Gy_EquipFileBillMain " +
                   " (HInterID,hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
@@ -334,6 +355,29 @@
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                objJsonResult = AddBillSub(msg3, msg4, HInterID, hbillno, 1);

                //保存后控制=========================================
                ds = oCN.RunProcReturn("Exec h_p_Gy_EquipFileBillMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + hbillno + "','" + HBillNote + "',1 ", "h_p_Gy_EquipFileBillMain_AfterSaveCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:保存前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {                  
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存失败!原因:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;                    
                }
                //=========================================================

                oCN.Commit();
                //objJsonResult.data = null;
                return objJsonResult;
@@ -513,7 +557,7 @@
                    oCN.RunProc("delete from Gy_EquipFileBillSub_DotCheckRule where HInterID = " + HInterID );
                }
                int i = 0;
                //保存保养规格
                //保存保养规程
                foreach (ClsGy_EquipFileBillSub_MaintainRule oSub in MaintainRuleColl)
                {
                    i++;
@@ -521,9 +565,9 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + i + "行,保养规格不能为空";
                        objJsonResult.Message = "第" + i + "行,保养规程不能为空";
                        objJsonResult.data = null;
                        throw new Exception("保养规格不能为空");
                        throw new Exception("保养规程不能为空");
                }
                    DataSet Cs;
                    Int64 NewHEntryID = 1;
@@ -589,7 +633,7 @@
                //修改上级为非末级代码
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存子表成功！";
                objJsonResult.Message = "保存成功！";
                //objJsonResult.data = null;
                return objJsonResult;
        }

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -4032,7 +4032,7 @@
                lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
                foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    oItem.HMaker = msg4;
                    UserName = msg4;  //制单人
                    oItem.HBillType = "3807";
                    oItem.HBillSubType = "3807";
@@ -5102,7 +5102,7 @@
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();

            string msg6 = sArray[4].ToString();

            string UserName = "";
            ListModels oListModels = new ListModels();
@@ -5223,6 +5223,32 @@
                    oBill.DetailColl.Add(oItemSub);

                }

                //表体数据
                //按 },{来拆分数组 //去掉【和】
                //如果是编辑就允许保存,否则不允许
                if (oBill.omodel.HInterID != 0)
                {
                    msg6 = msg6.Substring(1, msg6.Length - 2);
                    msg6 = msg6.Replace("\\", "");
                    msg6 = msg6.Replace("\n", "");  
                    List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> lss = new List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>();
                    lss = oListModels.getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(msg6);
                    int l = 0;
                    foreach (Model.ClsSc_MouldMaintainPlanBillSub_Plan oItem in lss)
                    {

                        l++;
                        oItem.HEntryID = l;
                        oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                        oItem.HCloseType = false;   //关闭类型
                        oItem.HSourceInterID = 0;     // æºå•ä¸»å†…码
                        oItem.HSourceEntryID = 0;   //源单子内码
                        oItem.HRelationQty = 0;     //关联数量                  
                        oBill.DetailCol2.Add(oItem);
                    }
                }
                
                //保存
                //保存完毕后处理
                bool bResult;
@@ -5538,7 +5564,7 @@
                foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
                {
                    UserName = oItem.HMaker;  //制单人
                    DBUtility.ClsPub.CurUserName = UserName;
                    DBUtility.ClsPub.CurUserName = msg5;
                    oItem.HBillType = "3819";
                    oItem.HBillSubType = "3819";


 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -1055,7 +1055,7 @@
                else
                {
                    string sql1 = "select * from h_v_OA_ErrMsgBackBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList_Query");
                }

@@ -1387,16 +1387,15 @@
            {
                List<object> columnNameList = new List<object>();

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam order by é‡‡é›†æ—¥æœŸ desc", "h_v_Sb_EquipMentCollectionTechParam");
                }
                else
                {
                    string sql1 = "select * from h_v_Sb_EquipMentCollectionTechParam where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by é‡‡é›†æ—¥æœŸ ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParam");
                }
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HEquipNumber = dic["HEquipNumber"].ToString();//设备编码
                string HTechParamName = dic["HTechParamName"].ToString();//工艺产数
                string HDate = dic["HDate"].ToString();//采集日期
                string HDate1 = dic["HDate1"].ToString();//采集日期
                string HEquipType = dic["HEquipType"].ToString();//查询类型

                ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParam '"+ HEquipNumber + "','"+ HTechParamName + "','"+ HDate + "','"+ HDate1 + "','"+ HEquipType + "'", "h_p_Sb_EquipMentCollectionTechParam");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_SingleBalBillController.cs

@@ -783,12 +783,20 @@
        {
            try
            {
                DAL.ClsGy_ProcPrice_Ctl oProcPrice = new DAL.ClsGy_ProcPrice_Ctl();
                double HPrice = oProcPrice.LoadProcPrice(HMaterID, HProcID, HSourceID, true);
                double HPrice=0;
                ds = oCn.RunProcReturn("exec h_p_Pay_GetPriceByMaterHProcHSource " + HMaterID.ToString() + "," + HProcID.ToString() + "," + HSourceID.ToString(), "h_p_Pay_GetPriceByMaterHProcHSource");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    HPrice = 0;
                }
                else
                {
                    HPrice = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[0]["HPrice"]);
                }

                objJsonResult.code = "1";
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "成功！";
                objJsonResult.data = HPrice;
                return objJsonResult;
            }

 WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs

@@ -16,6 +16,7 @@
using DingTalk.Api;
using DingTalk.Api.Response;
using System.Globalization;
using System.Linq;

namespace WebAPI.Controllers
{
@@ -268,15 +269,23 @@
            public string HExplanation;//   varchar(500)    --维修要求        
            public string HInnerBillNo;//   varchar(50)   --内部单据号
            public Int64 HMouldID;
            public Int64 HMouldMaintainRuleInterID;
            public Int64 HMaintainItemID;
            public Int64 HSupID;//        int    --供应商（Gy_Supplier）                    addnew
            public string HRepairType;//    varchar(10)        --维修类型（内部维修，委外维修）       addnew
            public string HNewModel;//    varchar(100)        --维修后新规格                addnew
            public Single HNewDesignLife;//    money            --新设计寿命
            public string HRemark;
          
            public DateTime HRequestComDate;
            public double HRecentMainModule;
            public double HCumulativeModule;
            public double HProductionModule;
            public DateTime HRepairAccepDate;



            //单据内容
            public string HBillNo;                                //单据号
            public string HDate;                                //日期
            public string HCheckLevel;                          //审核等级
            public string HArea;                                //区域
@@ -332,6 +341,10 @@
            public Single HPlanTimes;// money         --计划维修工时
            public Single HTimes;// money       --实际维修工时
            public string HRemark2;//备注
            public string HRepairCategory;
            public string HUrgenLevel;
            public string HRepairer;
            public string HIsCapacityImpact;

            //单据内容
            public string HDate;                                //日期
@@ -510,7 +523,7 @@
                //OriginatorId = "12",                                                                                          //根据流程发起人工号查询。

                //TaskId = "12",                                                                                                //任务ID。
                //CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                //CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                //CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //创建时间终止值。
                ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),                                          //修改时间起始值。
                ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //修改时间终止值。
@@ -2061,6 +2074,13 @@
                                continue;
                            }

                            //开单日期
                            if (keys.Contains("dateField_lq0v65sv"))
                            {
                                double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
                                oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
                            }

                            //修模开始时间
                            if (keys.Contains("dateField_lq4gf2ih"))
                            {
@@ -2075,17 +2095,52 @@
                                oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
                            }

                            //模具批次号
                            //模具单据号
                            if (keys.Contains("serialNumberField_lqaak4ts"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
                                oItem.HRemark = HDate_Temp;
                                oItem.HBillNo = HDate_Temp;
                            }

                            //模具编码
                            if (keys.Contains("dateField_lq4gf2ii"))
                            //要求完成日期
                            if (keys.Contains("dateField_lq3idkvd"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString();
                                double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq3idkvd"].ToString());
                                oItem.HRequestComDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
                            }

                            //维修受理日期
                            if (keys.Contains("dateField_lq4gf2ih"))
                            {
                                double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
                                oItem.HRepairAccepDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
                            }

                            //最近保养模数
                            if (keys.Contains("numberField_lq3idkvi"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
                                oItem.HRecentMainModule = double.Parse(HDate_Temp);
                            }

                            //累计模数
                            if (keys.Contains("numberField_lq3idkvj"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
                                oItem.HCumulativeModule = double.Parse(HDate_Temp);
                            }

                            //本次生产模数
                            if (keys.Contains("textField_lq4vdvgh"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textField_lq4vdvgh"].ToString();
                                oItem.HProductionModule = double.Parse(HDate_Temp);
                            }
                            
                            //模具编码
                            if (keys.Contains("selectField_lq3idkvg"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
                                DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock)  where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
                                string HMouldID = "0";
                                if (ds.Tables[0].Rows.Count > 0)
@@ -2093,6 +2148,7 @@
                                    HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
                                }
                                oItem.HMouldID = long.Parse(HMouldID);
                                oItem.HRemark = HDate_Temp;
                            }


@@ -2116,7 +2172,7 @@
                            if (keys.Contains("employeeField_lq3idkvh"))
                            {
                                string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lq3idkvh"]));
                                DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
                                DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where hname='" + HDate_Temp[0] + "'", "Gy_Employee");
                                string HEmpID = "0";
                                if (ds.Tables[0].Rows.Count > 0)
                                {
@@ -2233,6 +2289,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e.Message);
                msg = e.Message;
                return false;
            }
@@ -2268,11 +2325,33 @@
            try
            {
                oCN.BeginTran();

                string HMouldMaintainRuleInterID = "0";
                string HMaintainItemID = "0";
                string HRepairID = "0";
                DataSet dataSet = oCN.RunProcReturn(@"select  a.HInterID,item.HMaintainItemID    from Sc_MouldMaintainRuleBillMain a with(nolock)
inner join Sc_MouldMaintainRuleBillSub_Item item with(nolock) on  a.HInterID = item.HInterID
where a.HRemark like'%钉钉同步%'", "Sc_MouldMaintainRuleBillMain");

                if (dataSet.Tables[0].Rows.Count > 0)
                {
                    HMouldMaintainRuleInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
                    HMaintainItemID = dataSet.Tables[0].Rows[0]["HMaintainItemID"].ToString();
                }

                dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%钉钉同步%' and HName like'%模具维修%'", "Gy_Repair");

                if (dataSet.Tables[0].Rows.Count > 0)
                {
                    HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
                }

                foreach (MouldFileWeiXiuBaoYang oItem in lsmain)
                {
                    //保养记录
                    if (oItem.DetailColMouldMaintain.Count != 0)
                    {
                       
                        string BillType = "3819";
                        string sql = $@"select HInnerBillNo from Sc_MouldMaintainBillMain
                            where HInnerBillNo = '{oItem.HInstanceID}'";
@@ -2281,7 +2360,7 @@
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                            string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                            //string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                            //long HInterID = 0;
                            //string HBillNo = "";
                            string sql_main = "Insert Into Sc_MouldMaintainBillMain " +
@@ -2290,11 +2369,13 @@
                ",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
                ",HEndDate" +
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
                ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate(),'" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
                ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule)" +
                "values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem.HDate + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
                      ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HUpdateDate + "'" +
                      ",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
                      ",'" + oItem.HRepairEndDate + "'" +
                      ",'" + oItem.HInstanceID + "','',0,0,'OK')";
                      ",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",0,'OK'" +
                      ",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + ")";
                            LogService.Write(sql_main);
                            oCN.RunProc(sql_main);
                            int i = 1;
@@ -2306,11 +2387,12 @@
                          ",HManagerID" +
                          ",HCloseMan,HCloseType,HRemark" +
                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
                          ") values('" + HInterID + "'," + i + ",0,'" + oItem_Detail.HClaim + "'" +
                          ") " +
                          "values('" + HInterID + "'," + i + ","+ HMaintainItemID + ",'" + oItem_Detail.HClaim + "'" +
                     ",'','" + oItem_Detail.HClaim + "'" +
                     ",'" + oItem.HEmpID + "'" +
                     ",'','','" + oItem_Detail.HMaintainResult + "'" +
                     ",'0','0','','',0,0,'')";
                     ",'0','0','','',0,0,'Y')";
                                LogService.Write(sql_sub);
                                oCN.RunProc(sql_sub);
                                i += 1;
@@ -2330,7 +2412,7 @@
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                            string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                            //string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                            //long HInterID = 0;
                            //string HBillNo = "";
                            string sql_main = "Insert Into Sc_MouldRepairWorkBillMain " +
@@ -2340,12 +2422,14 @@
                ",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID" +
                ",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
                ",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
                ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
                ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
                      ",'0','0','" + oItem.HRepairBeginDate + "','" + oItem.HUpdateDate + "',''" +
                ",HRepairAccepDate)values" +
                "('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem .HDate+ "'" +
                ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
                      ",'0','"+ HRepairID + "','" + oItem.HRepairBeginDate + "','" + oItem.HRepairEndDate + "',''" +
                      ",'小时','" + oItem.HPlanTimes + "','" + oItem.HTimes + "','" + oItem.HEmpID + "',0" +
                      ",'" + oItem.HDeptID + "','','" + oItem.HInstanceID + "','" + oItem.HMouldID + "'" +
                      ",'0','内部维修','','" + oItem.HNewDesignLife + "','',0,0)";
                      ",'0','内部维修','','" + oItem.HNewDesignLife + "','1',0,0" +
                      ",'"+ oItem.HRepairAccepDate + "')";
                            LogService.Write(sql_main);
                            oCN.RunProc(sql_main);
                            int i = 1;
@@ -2357,7 +2441,7 @@
                       ",HRepairID,HRepairExplanation,HManagerID,HMoney) values" +
                       "('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
                          ",0,0,'','',0,0" +
                          ",0,'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
                          ","+ HRepairID + ",'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
                                LogService.Write(sql_sub);
                                oCN.RunProc(sql_sub);
                                i += 1;
@@ -2373,6 +2457,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e.Message);
                msg = e.Message;
                oCN.RollBack();
                return false;
@@ -2385,7 +2470,7 @@
        #region èŽ·å– å®œæ­-设备维修记录单 å®žä¾‹ID列表对应的实例详情
        public bool getInstanceDetailList___EquipRepairWeiXiu_YiDa(string appType, string systemToken, string userID, string formUuid, List<string> IDList, ref List<EquipRepairWeiXiu> lsmain, ref string msg, int size = 500)
        {

            string a = "";
            try
            {
                int startIndex = 0;
@@ -2437,11 +2522,59 @@
                                continue;
                            }

                            //报修类别
                            if (keys.Contains("multiSelectField_lfg9hgyv"))
                            {
                                string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["multiSelectField_lfg9hgyv"]));

                                oItem.HRepairCategory = HDate_Temp[0];
                            }

                            //紧急程度
                            if (keys.Contains("radioField_kzgkw10c"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["radioField_kzgkw10c"].ToString();

                                oItem.HUrgenLevel = HDate_Temp;
                            }

                            //报修人
                            if (keys.Contains("employeeField_lkasesrk"))
                            {
                                string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lkasesrk"]));

                                oItem.HRepairer = HDate_Temp[0];
                            }

                            //是否有产能影响
                            if (keys.Contains("textField_lyjddw0r"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textField_lyjddw0r"].ToString();

                                oItem.HIsCapacityImpact = HDate_Temp;
                            }
                         
                            //维修时间
                            if (keys.Contains("textField_l2r95oo2"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();
                                bool containsNumber = HDate_Temp.Any(c => char.IsDigit(c));
                           
                                if (!containsNumber)
                                {
                                    HDate_Temp = "0";
                                }
                                LogService.Write("1:------"+HDate_Temp+ ",2:------" + int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray())));
                                //a = HDate_Temp;
                                oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
                                oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
                            }

                            //设备编码
                            if (keys.Contains("textField_lfg9hgys"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
                                DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock)  where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
                                DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock)  where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
                                string HEquipID = "0";
                                if (ds.Tables[0].Rows.Count > 0)
                                {
@@ -2450,7 +2583,6 @@
                                oItem.HEquipID = long.Parse(HEquipID);
                                oItem.HRemark2 = HDate_Temp;
                            }


                            //维修部门
                            if (keys.Contains("selectField_kzgkw10a"))
@@ -2465,27 +2597,17 @@
                                oItem.HDeptID = long.Parse(HDeptID);
                            }


                            //维修人
                            if (keys.Contains("employeeField_lthwkdh2"))
                            {
                                string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
                                DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
                                DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock)  where HName='" + HDate_Temp[0] + "'", "Gy_Employee");
                                string HEmpID = "0";
                                if (ds.Tables[0].Rows.Count > 0)
                                {
                                    HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                                }
                                oItem.HEmpID = long.Parse(HEmpID);
                            }

                            //维修时间
                            if (keys.Contains("textField_l2r95oo2"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();

                                oItem.HTimes = long.Parse(HDate_Temp);
                                oItem.HPlanTimes = long.Parse(HDate_Temp);
                            }

                            //维修内容
@@ -2505,7 +2627,7 @@
                            if (keys.Contains("textareaField_lthwo99r"))
                            {
                                string HDate_Temp = response.Body.Result[i].FormData["textareaField_lthwo99r"].ToString();

                                oItem.HExplanation = HDate_Temp;
                                sub.HRepairExplanation = HDate_Temp;
                            }

@@ -2551,6 +2673,8 @@
                        }
                        catch (Exception e)
                        {
                            //LogService.Write(a);
                            a = "";
                            continue;
                        }
                    }
@@ -2586,7 +2710,7 @@
            int pageNumber = 1;
            int pageSize = 100;

            //获取模具维修保养表的实例ID列表
            //获取设备维修保养表的实例ID列表
            List<string> IDList = new List<string>();
            if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
            {
@@ -2603,6 +2727,14 @@
            try
            {
                oCN.BeginTran();

               DataSet dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%钉钉同步%' and HName like'%设备维修%'", "Gy_Repair");
                string HRepairID = "0";
                if (dataSet.Tables[0].Rows.Count > 0)
                {
                    HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
                }

                foreach (EquipRepairWeiXiu oItem in lsmain)
                {
                    //维修记录
@@ -2625,11 +2757,13 @@
                ",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
                ",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate" +
                ",HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
                ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
                ",HRepairCategory,HUrgenLevel,HRepairer,HIsCapacityImpact)" +
                "values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
                ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark2 + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
                      ",'" + oItem.HEquipID + "','0','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
                      ",'" + oItem.HDeptID + "','" + oItem.HExplanation + "','" + oItem.HInstanceID + "','',''" +
                      ",'" + oItem.HRepairContent + "','小时','','0',0)";
                      ",'" + oItem.HEquipID + "','"+ HRepairID + "','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
                      ",'" + oItem.HDeptID + "','"+ oItem.HExplanation + "','" + oItem.HInstanceID + "','"+ oItem.HMakeDate + "','" + oItem.HUpdateDate + "'" +
                      ",'" + oItem.HRepairContent + "','小时','手工录入','0',0" +
                      ",'"+ oItem.HRepairCategory + "','" + oItem.HUrgenLevel + "','" + oItem.HRepairer + "','" + oItem.HIsCapacityImpact + "')";
                            LogService.Write(sql_main);
                            oCN.RunProc(sql_main);
                            int i = 1;
@@ -2641,7 +2775,7 @@
                       ",HRepairID,HManagerID,HRepairExplanation,HEmpID)" +
                       "values('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
                          ",0,0,'','',0,0" +
                          ",0,'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
                          "," + HRepairID + ",'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
                                LogService.Write(sql_sub);
                                oCN.RunProc(sql_sub);
                                i += 1;
@@ -2657,6 +2791,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e.Message);
                msg = e.Message;
                oCN.RollBack();
                return false;

 WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs

@@ -75,6 +75,10 @@
                ",HPlanTimes=" + omodel.HPlanTimes.ToString() +
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HRepairCategory='" + omodel.HRepairCategory + "'" +
                ",HUrgenLevel='" + omodel.HUrgenLevel + "'" +
                ",HRepairer='" + omodel.HRepairer + "'" +
                ",HIsCapacityImpact='" + omodel.HIsCapacityImpact + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HRepairContent='" + omodel.HRepairContent + "'" +
                ",HMainSourceBillType='"+ omodel.HMainSourceBillType+"'"+
@@ -194,13 +198,14 @@
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
                ",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate,HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
                ",HRepairCategory,HUrgenLevel,HRepairer,HIsCapacityImpact" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                ", " + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + "," + omodel.HPlanTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HTimes.ToString() +
                ", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "','" +
                 omodel.HMainSourceBillType+"',"+ omodel.HMainSourceInterID.ToString()+","+ omodel.HMainSourceEntryID.ToString() +
                ") ");
                ",'"+ omodel.HRepairCategory + "','" + omodel.HUrgenLevel + "','" + omodel.HRepairer + "','" + omodel.HIsCapacityImpact + "') ");
                //插入子表
                foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
                {

 WebAPI/ListModels.cs

@@ -873,6 +873,19 @@
        }

        /// <summary>
        /// å¤„理新增模具保养计划单子表_计划的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>>(jsonString);
            return list;
        }


        /// <summary>
        /// å¤„理新增模具保养计划单子表保养信息的json
        /// </summary>
        /// <param name="jsonString"></param>

 WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs

@@ -23,6 +23,10 @@
        public string HCycleUnit;//varchar(10)    --时间单位(小时，天)
        public Single HPlanTimes;// money         --计划维修工时
        public Single HTimes;// money       --实际维修工时
        
        public string HRepairCategory;//        --报修类别
        public string HUrgenLevel;//        --紧急程度
        public string HRepairer;//        --报修人
        public string HIsCapacityImpact;//       --是否有产能影响

    }
}

 WebAPI/Models/Gy_Mould.cs

@@ -69,6 +69,7 @@
        public int HNowSPID { get; set; }

        public double HInitLife { get; set; }
        public string HMouldUseStatus { get; set; }

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-09-20T06:36:35.1508292Z;True|2024-09-20T14:23:14.7828767+08:00;True|2024-09-20T10:20:42.4614808+08:00;False|2024-09-20T10:20:30.9842799+08:00;True|2024-09-19T14:20:56.6643781+08:00;True|2024-09-19T09:54:32.7563188+08:00;False|2024-09-19T09:54:16.5345071+08:00;True|2024-09-19T09:07:11.2182586+08:00;False|2024-09-19T09:07:00.2356340+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <History>True|2024-09-27T07:00:21.0482043Z;True|2024-09-27T14:57:07.0747471+08:00;True|2024-09-27T14:53:52.8423718+08:00;True|2024-09-27T13:29:58.8925618+08:00;False|2024-09-27T13:29:52.7163123+08:00;True|2024-09-26T20:27:04.5201970+08:00;True|2024-09-26T19:16:26.6734751+08:00;True|2024-09-26T19:13:46.3429211+08:00;True|2024-09-26T18:50:55.3033341+08:00;True|2024-09-26T18:35:44.3607797+08:00;True|2024-09-26T18:33:11.2986890+08:00;True|2024-09-26T18:08:00.5018121+08:00;True|2024-09-26T17:57:04.3987105+08:00;False|2024-09-26T17:55:37.3316215+08:00;True|2024-09-26T17:53:52.1377436+08:00;False|2024-09-26T17:53:46.2067050+08:00;True|2024-09-25T17:21:24.1078881+08:00;True|2024-09-25T17:04:17.9619045+08:00;True|2024-09-23T10:58:34.6129284+08:00;True|2024-09-23T10:58:28.2863739+08:00;True|2024-09-23T10:46:39.8062504+08:00;False|2024-09-23T10:46:28.2127212+08:00;True|2024-09-23T10:41:36.7887633+08:00;False|2024-09-23T10:41:31.1693720+08:00;True|2024-09-20T14:36:35.1508292+08:00;True|2024-09-20T14:23:14.7828767+08:00;True|2024-09-20T10:20:42.4614808+08:00;False|2024-09-20T10:20:30.9842799+08:00;True|2024-09-19T14:20:56.6643781+08:00;True|2024-09-19T09:54:32.7563188+08:00;False|2024-09-19T09:54:16.5345071+08:00;True|2024-09-19T09:07:11.2182586+08:00;False|2024-09-19T09:07:00.2356340+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>09/20/2024 14:35:00</publishTime>
      <publishTime>09/27/2024 14:59:57</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>09/20/2024 14:35:00</publishTime>
      <publishTime>09/27/2024 14:59:57</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>09/20/2024 14:34:59</publishTime>
      <publishTime>09/27/2024 14:59:56</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>09/20/2024 14:34:59</publishTime>
      <publishTime>09/27/2024 14:59:56</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>09/20/2024 14:34:57</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>09/20/2024 14:34:57</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>09/20/2024 14:34:55</publishTime>
      <publishTime>09/27/2024 14:59:51</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>09/20/2024 14:34:55</publishTime>
      <publishTime>09/27/2024 14:59:51</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:52</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>09/20/2024 14:34:56</publishTime>
      <publishTime>09/27/2024 14:59:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>09/20/2024 14:34:54</publishTime>
      <publishTime>09/27/2024 14:59:51</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>09/20/2024 14:34:54</publishTime>
      <publishTime>09/27/2024 14:59:51</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>09/20/2024 14:34:57</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>09/20/2024 14:34:57</publishTime>
      <publishTime>09/27/2024 14:59:53</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>09/20/2024 14:35:17</publishTime>
      <publishTime>09/27/2024 15:00:14</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>09/20/2024 14:35:17</publishTime>
      <publishTime>09/27/2024 15:00:14</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>09/20/2024 14:36:34</publishTime>
      <publishTime>09/27/2024 15:00:20</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Web.config

@@ -23,8 +23,7 @@
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />--><!--颜台式机-->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>-->
        <!--颜台式机-->
        <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/> <!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -38,7 +37,7 @@
        <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <add key="surl" value="http://localhost/webs-web/webservice1.asmx" />    <!--翁涛涛本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />-->    <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        
@@ -109,13 +108,13 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>
    <applicationSettings>
        <WebAPI.Properties.Settings>
            <setting name="WebAPI_WebS_WebService1" serializeAs="String">
                <value>http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx</value>
                <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
            </setting>
        </WebAPI.Properties.Settings>
    </applicationSettings>

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -1,12 +1,12 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

File was deleted

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ