From e83f0e9dbec9c08317747f835922dd440ddddb51 Mon Sep 17 00:00:00 2001
From: wrx <88384874@qq.com>
Date: Fri, 31 May 2024 17:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BB=B6=E8=A3=85=E9=85=8D=E5=92=8C?=
=?UTF-8?q?=E5=86=B2=E5=AD=94,=E8=A7=86=E9=A2=91=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E7=AD=89=E5=8A=9F=E8=83=BD=E9=A1=B9=E7=9B=AE.=E6=95=B4?=
=?UTF-8?q?=E4=BD=93=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SjMes/PunchAssemble/BBMPT.sln | 42 +
.../PunchAssemble/MESClassLibrary/App.config | 20 +
.../BLL/Andon/AndonButtonRecordBLL.cs | 42 +
.../BLL/Andon/AndonButtonTypeBLL.cs | 31 +
.../MESClassLibrary/BLL/BasicBLL.cs | 178 +
.../BLL/BasicInfo/BadInjectionBLL.cs | 44 +
.../BLL/BasicInfo/BarCodeBLL.cs | 174 +
.../MESClassLibrary/BLL/BasicInfo/BomBLL.cs | 271 +
.../BLL/BasicInfo/BucketInfoBLL.cs | 184 +
.../BLL/BasicInfo/CheckItemBLL.cs | 198 +
.../MESClassLibrary/BLL/BasicInfo/ColorBLL.cs | 214 +
.../BLL/BasicInfo/DefectBLL.cs | 181 +
.../MESClassLibrary/BLL/BasicInfo/DeptBLL.cs | 144 +
.../BLL/BasicInfo/DeviceBLL.cs | 251 +
.../BLL/BasicInfo/FactoryBLL.cs | 148 +
.../BLL/BasicInfo/ImgVideoBLL.cs | 141 +
.../BLL/BasicInfo/InjectionPlanBLL.cs | 391 +
.../MESClassLibrary/BLL/BasicInfo/LineBLL.cs | 170 +
.../BLL/BasicInfo/MachineBLL.cs | 184 +
.../BLL/BasicInfo/ModelInfoBLL.cs | 208 +
.../BLL/BasicInfo/ModelUpdateBLL.cs | 137 +
.../BLL/BasicInfo/OperatorBLL.cs | 185 +
.../BLL/BasicInfo/PaintInfoBLL.cs | 335 +
.../MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs | 165 +
.../BLL/BasicInfo/PlasticBLL.cs | 238 +
.../BLL/BasicInfo/ProductBLL.cs | 443 +
.../BLL/BasicInfo/ProductOfInjectionBLL.cs | 83 +
.../BLL/BasicInfo/ProductTypeBLL.cs | 182 +
.../BLL/BasicInfo/StationBLL.cs | 195 +
.../BLL/Check/InspectResultBLL.cs | 1506 +++
.../BLL/ExchangeCenter/GetNewTasksBLL.cs | 29 +
.../BLL/ExchangeCenter/PartMstrBLL.cs | 29 +
.../BLL/ExchangeCenter/PartRecordBLL.cs | 29 +
.../BLL/ExchangeCenter/TESBomBLL.cs | 58 +
.../BLL/ExchangeCenter/TESPartDetBLL.cs | 28 +
.../BLL/Injection/DownReasonBLL.cs | 29 +
.../BLL/Injection/InjectionDownRecordBLL.cs | 891 ++
.../BLL/Injection/InjectionRecordBLL.cs | 1979 +++
.../BLL/Inspection/CommonlyInspectionBLL.cs | 596 +
.../CommonlyInspectionVersionBLL.cs | 208 +
.../BLL/Mistake247/AssemblyBLL.cs | 100 +
.../MESClassLibrary/BLL/Mistake247/BoxBLL.cs | 86 +
.../BLL/Mistake247/MistakeBLL.cs | 72 +
.../BLL/Mistake247/Plan247BLL.cs | 101 +
.../BLL/Mistake247/RecordBLL.cs | 171 +
.../BLL/Painting/InspectResultBLL.cs | 29 +
.../BLL/Painting/PaintBarCodeBLL.cs | 72 +
.../BLL/Painting/StockInBLL.cs | 114 +
.../MESClassLibrary/BLL/Plan247/Plan247BLL.cs | 399 +
.../BLL/PunchAndWeld/PlanPunchBLL.cs | 451 +
.../BLL/PunchAndWeld/PunchAdressBLL.cs | 29 +
.../BLL/PunchAndWeld/PunchAndStationBLL.cs | 182 +
.../BLL/PunchAndWeld/PunchDeviceBLL.cs | 42 +
.../BLL/PunchAndWeld/PunchPartBLL.cs | 29 +
.../BLL/PunchAndWeld/PunchPlanBLL.cs | 94 +
.../BLL/PunchAndWeld/PunchRecordBLL.cs | 44 +
.../BLL/PunchAndWeld/PunchValueRecordBLL.cs | 29 +
.../BLL/Record247/Record247BLL.cs | 81 +
.../BLL/Report/FiveScreenBLL.cs | 190 +
.../BLL/Report/FiveScreenLastBLL.cs | 153 +
.../BLL/Report/FiveScreenStandardBLL.cs | 161 +
.../MESClassLibrary/BLL/Show/AnalysisBLL.cs | 57 +
.../MESClassLibrary/BLL/Stock/StockInBLL.cs | 156 +
.../BLL/User/Sys_ButtonsService.cs | 45 +
.../BLL/User/Sys_NavMenuService.cs | 83 +
.../MESClassLibrary/BLL/User/UserBLL.cs | 304 +
.../DAL/Andon/AndonButtonRecordDAL.cs | 68 +
.../DAL/Andon/AndonButtonTypeDAL.cs | 34 +
.../MESClassLibrary/DAL/BaseDAL.cs | 199 +
.../MESClassLibrary/DAL/BasicDAL.cs | 51 +
.../DAL/BasicInfo/BadInjectionDAL.cs | 92 +
.../DAL/BasicInfo/BarCodeDAl.cs | 440 +
.../MESClassLibrary/DAL/BasicInfo/BomDAL.cs | 150 +
.../MESClassLibrary/DAL/BasicInfo/ColorDAL.cs | 55 +
.../DAL/BasicInfo/DefectDAL.cs | 35 +
.../DAL/BasicInfo/InjectionPlanDAL.cs | 199 +
.../DAL/BasicInfo/OperatorDAL.cs | 73 +
.../DAL/BasicInfo/ProductDAL.cs | 245 +
.../DAL/BasicInfo/ProductOfInjectionDAL.cs | 265 +
.../DAL/BasicInfo/ProductTypeDAL.cs | 210 +
.../DAL/BasicInfo/StationDAL.cs | 38 +
.../DAL/Check/InspectResultDAL.cs | 253 +
.../MESClassLibrary/DAL/DataTableExtend.cs | 80 +
.../DAL/ExchangeCenter/GetNewTasksDAL.cs | 123 +
.../DAL/ExchangeCenter/PartMstrDAL.cs | 110 +
.../DAL/ExchangeCenter/PartRecordDAL.cs | 46 +
.../DAL/ExchangeCenter/TESBomDAL.cs | 177 +
.../DAL/ExchangeCenter/TESPartDetDAL.cs | 93 +
.../DAL/Injection/DownReasonDAL.cs | 31 +
.../DAL/Injection/InjectionDownRecordDAL.cs | 159 +
.../DAL/Injection/InjectionRecordDAL.cs | 113 +
.../DAL/Mistake247/AssemblyDAL.cs | 202 +
.../MESClassLibrary/DAL/Mistake247/BoxDAL.cs | 168 +
.../DAL/Mistake247/MistakeDAL.cs | 104 +
.../DAL/Mistake247/Plan247DAL.cs | 214 +
.../DAL/Mistake247/RecordDAL.cs | 311 +
.../MESClassLibrary/DAL/Plan247/Plan247DAL.cs | 13 +
.../DAL/PunchAndWeld/PunchAdressDAL.cs | 37 +
.../DAL/PunchAndWeld/PunchAndStationDAL.cs | 42 +
.../DAL/PunchAndWeld/PunchDeviceDAL.cs | 51 +
.../DAL/PunchAndWeld/PunchPartDAL.cs | 29 +
.../DAL/PunchAndWeld/PunchPlanDAL.cs | 172 +
.../DAL/PunchAndWeld/PunchRecordDAL.cs | 64 +
.../DAL/PunchAndWeld/PunchValueRecordDAL.cs | 52 +
.../MESClassLibrary/DAL/SqlHelper.cs | 2482 ++++
.../DAL/User/Sys_ButtonsData.cs | 75 +
.../DAL/User/Sys_NavMenuData.cs | 107 +
.../MESClassLibrary/DAL/User/UserDAL.cs | 421 +
.../DAL/painting/InspectResultDAL.cs | 83 +
.../DAL/painting/PaintBarCodeDAL.cs | 181 +
.../DAL/painting/StockInDAL.cs | 596 +
.../MESClassLibrary/EFModel/BBMPT.Context.cs | 403 +
.../MESClassLibrary/EFModel/BBMPT.Context.tt | 636 +
.../MESClassLibrary/EFModel/BBMPT.Designer.cs | 10 +
.../MESClassLibrary/EFModel/BBMPT.cs | 9 +
.../MESClassLibrary/EFModel/BBMPT.edmx | 11035 ++++++++++++++++
.../EFModel/BBMPT.edmx.diagram | 242 +
.../MESClassLibrary/EFModel/BBMPT.tt | 733 +
.../MESClassLibrary/EFModel/LogErr.cs | 22 +
.../MESClassLibrary/EFModel/LogSys.cs | 22 +
.../EFModel/LogSys_202001_04.cs | 22 +
.../MESClassLibrary/EFModel/LogSys_202003.cs | 22 +
.../MESClassLibrary/EFModel/LogSys_202004.cs | 22 +
.../MESClassLibrary/EFModel/LogSys_202005.cs | 22 +
.../EFModel/LogSys_20200605.cs | 22 +
.../EFModel/LogSys_20200610.cs | 22 +
.../MESClassLibrary/EFModel/LogSys_202008.cs | 22 +
.../EFModel/LogSys_20210322.cs | 22 +
.../EFModel/QRTZ_BLOB_TRIGGERS.cs | 22 +
.../MESClassLibrary/EFModel/QRTZ_CALENDARS.cs | 21 +
.../EFModel/QRTZ_CRON_TRIGGERS.cs | 23 +
.../EFModel/QRTZ_FIRED_TRIGGERS.cs | 31 +
.../EFModel/QRTZ_JOB_DETAILS.cs | 28 +
.../MESClassLibrary/EFModel/QRTZ_LOCKS.cs | 20 +
.../EFModel/QRTZ_PAUSED_TRIGGER_GRPS.cs | 20 +
.../EFModel/QRTZ_SCHEDULER_STATE.cs | 22 +
.../EFModel/QRTZ_SIMPLE_TRIGGERS.cs | 24 +
.../EFModel/QRTZ_SIMPROP_TRIGGERS.cs | 32 +
.../MESClassLibrary/EFModel/QRTZ_TRIGGERS.cs | 35 +
.../MESClassLibrary/EFModel/TA_DEPT.cs | 30 +
.../MESClassLibrary/EFModel/TES_BOM.cs | 45 +
.../MESClassLibrary/EFModel/TES_PART_MSTR.cs | 36 +
.../MESClassLibrary/EFModel/T_PaintInfo.cs | 26 +
.../MESClassLibrary/EFModel/T_Sys_Buttons.cs | 26 +
.../MESClassLibrary/EFModel/T_Sys_NavMenu.cs | 26 +
.../MESClassLibrary/EFModel/T_Sys_Power.cs | 32 +
.../MESClassLibrary/EFModel/T_Sys_Role.cs | 23 +
.../EFModel/T_Sys_RoleLinkPower.cs | 24 +
.../MESClassLibrary/EFModel/T_Sys_UserRole.cs | 22 +
.../MESClassLibrary/EFModel/T_Sys_Users.cs | 31 +
.../EFModel/T_Sys_Users_NavMenu.cs | 21 +
.../MESClassLibrary/EFModel/fine_authority.cs | 25 +
.../EFModel/fine_authority_object.cs | 31 +
.../EFModel/fine_backup_node.cs | 25 +
.../EFModel/fine_base_message.cs | 29 +
.../EFModel/fine_base_output.cs | 24 +
.../MESClassLibrary/EFModel/fine_block_ip.cs | 22 +
.../EFModel/fine_conf_classname.cs | 20 +
.../EFModel/fine_conf_entity.cs | 20 +
.../EFModel/fine_conf_xmlentity.cs | 20 +
.../EFModel/fine_custom_role.cs | 25 +
.../MESClassLibrary/EFModel/fine_dep_role.cs | 24 +
.../EFModel/fine_department.cs | 27 +
.../EFModel/fine_extra_property.cs | 23 +
.../EFModel/fine_favorite_entry.cs | 22 +
.../EFModel/fine_homepage_expand.cs | 25 +
.../EFModel/fine_international.cs | 23 +
.../EFModel/fine_last_login.cs | 23 +
.../EFModel/fine_login_lock.cs | 26 +
.../EFModel/fine_mobile_device.cs | 25 +
.../EFModel/fine_mobile_push_message.cs | 24 +
.../EFModel/fine_output_class.cs | 20 +
.../EFModel/fine_output_client_notice.cs | 27 +
.../EFModel/fine_output_email.cs | 29 +
.../EFModel/fine_output_ftp.cs | 25 +
.../EFModel/fine_output_mount.cs | 23 +
.../EFModel/fine_output_platform_msg.cs | 22 +
.../EFModel/fine_output_print.cs | 20 +
.../EFModel/fine_output_sftp.cs | 25 +
.../EFModel/fine_output_sms.cs | 21 +
.../EFModel/fine_param_template.cs | 22 +
.../MESClassLibrary/EFModel/fine_post.cs | 25 +
.../EFModel/fine_print_offset.cs | 24 +
.../EFModel/fine_print_offset_ip_relate.cs | 21 +
.../EFModel/fine_process_expand.cs | 20 +
.../EFModel/fine_process_message.cs | 23 +
.../EFModel/fine_remote_design_auth.cs | 24 +
.../EFModel/fine_report_expand.cs | 21 +
.../EFModel/fine_schedule_output.cs | 22 +
.../EFModel/fine_schedule_record.cs | 29 +
.../EFModel/fine_schedule_task.cs | 41 +
.../EFModel/fine_schedule_task_param.cs | 22 +
.../EFModel/fine_swift_cluster_size.cs | 21 +
.../EFModel/fine_swift_col_idx_conf.cs | 22 +
.../EFModel/fine_swift_config_entity.cs | 20 +
.../EFModel/fine_swift_metadata.cs | 24 +
.../EFModel/fine_swift_seg_location.cs | 21 +
.../EFModel/fine_swift_segments.cs | 24 +
.../EFModel/fine_swift_service_info.cs | 23 +
.../EFModel/fine_swift_tab_idx_conf.cs | 20 +
.../EFModel/fine_swift_table_path.cs | 23 +
.../EFModel/fine_system_message.cs | 21 +
.../MESClassLibrary/EFModel/fine_user.cs | 34 +
.../EFModel/fine_user_role_middle.cs | 22 +
.../MESClassLibrary/EFModel/fine_vcs.cs | 25 +
.../MESClassLibrary/EFModel/fine_workflow.cs | 24 +
.../EFModel/fine_workflow_log.cs | 24 +
.../EFModel/fine_workflow_node.cs | 27 +
.../EFModel/fine_workflow_stash_data.cs | 23 +
.../EFModel/fine_workflow_task.cs | 32 +
.../EFModel/fine_workflow_task_impl.cs | 41 +
.../EFModel/fine_write_stash.cs | 22 +
.../EFModel/tb_AndonButtonType.cs | 21 +
.../MESClassLibrary/EFModel/tb_AndonRecord.cs | 23 +
.../EFModel/tb_Assembly_243.cs | 34 +
.../EFModel/tb_Assembly_247.cs | 36 +
.../EFModel/tb_Bad_Injection.cs | 24 +
.../MESClassLibrary/EFModel/tb_BarCode.cs | 30 +
.../MESClassLibrary/EFModel/tb_Bom.cs | 21 +
.../EFModel/tb_Bom_20190726.cs | 21 +
.../MESClassLibrary/EFModel/tb_Box_243.cs | 30 +
.../MESClassLibrary/EFModel/tb_Box_247.cs | 30 +
.../MESClassLibrary/EFModel/tb_Box_Record.cs | 22 +
.../EFModel/tb_Box_WheelBrow.cs | 27 +
.../MESClassLibrary/EFModel/tb_BucketInfo.cs | 23 +
.../MESClassLibrary/EFModel/tb_CheckItem.cs | 22 +
.../MESClassLibrary/EFModel/tb_Color.cs | 28 +
.../EFModel/tb_Color_20191008.cs | 24 +
.../EFModel/tb_Color_20201101.cs | 28 +
.../EFModel/tb_CommonlyInspection.cs | 28 +
.../EFModel/tb_CommonlyInspectionRecord.cs | 38 +
.../EFModel/tb_CommonlyInspectionVersion.cs | 30 +
.../MESClassLibrary/EFModel/tb_Config.cs | 25 +
.../MESClassLibrary/EFModel/tb_Cylinder.cs | 21 +
.../EFModel/tb_CylinderAndRaw.cs | 25 +
.../MESClassLibrary/EFModel/tb_Defect.cs | 22 +
.../MESClassLibrary/EFModel/tb_Device.cs | 25 +
.../MESClassLibrary/EFModel/tb_Factory.cs | 21 +
.../EFModel/tb_FinishProduct.cs | 22 +
.../MESClassLibrary/EFModel/tb_HybridPlan.cs | 25 +
.../EFModel/tb_HybridScanRecord.cs | 21 +
.../MESClassLibrary/EFModel/tb_ImgVideo.cs | 24 +
.../EFModel/tb_Inhection_DownReason.cs | 21 +
.../EFModel/tb_InjectPlanReport.cs | 25 +
.../EFModel/tb_InjectionPlan.cs | 33 +
.../EFModel/tb_Injection_DownRecord.cs | 30 +
.../EFModel/tb_Injection_DownTime.cs | 27 +
.../EFModel/tb_Injection_DownType.cs | 21 +
.../EFModel/tb_Injection_Record.cs | 27 +
.../EFModel/tb_InspectResult.cs | 35 +
.../EFModel/tb_InspectResult_20190902.cs | 35 +
.../EFModel/tb_InspectResult_20200717.cs | 35 +
.../EFModel/tb_InspectResult_20201021.cs | 35 +
.../EFModel/tb_InspectResult_20210322.cs | 35 +
.../MESClassLibrary/EFModel/tb_LayerAndBC.cs | 23 +
.../MESClassLibrary/EFModel/tb_Line.cs | 22 +
.../MESClassLibrary/EFModel/tb_Location.cs | 21 +
.../MESClassLibrary/EFModel/tb_Machine.cs | 21 +
.../MESClassLibrary/EFModel/tb_Mistake_243.cs | 25 +
.../EFModel/tb_Mistake_243_bak.cs | 25 +
.../MESClassLibrary/EFModel/tb_Mistake_247.cs | 25 +
.../MESClassLibrary/EFModel/tb_ModelCount.cs | 24 +
.../MESClassLibrary/EFModel/tb_ModelInfo.cs | 33 +
.../EFModel/tb_Model_Product.cs | 21 +
.../EFModel/tb_Model_Update.cs | 25 +
.../MESClassLibrary/EFModel/tb_Operator.cs | 24 +
.../EFModel/tb_PaintBarCode.cs | 32 +
.../MESClassLibrary/EFModel/tb_PaintInfo.cs | 26 +
.../MESClassLibrary/EFModel/tb_PaintPerson.cs | 20 +
.../MESClassLibrary/EFModel/tb_PaintReason.cs | 20 +
.../EFModel/tb_PaintScanRecord.cs | 23 +
.../EFModel/tb_Paint_Bucket.cs | 21 +
.../MESClassLibrary/EFModel/tb_PartRecord.cs | 23 +
.../MESClassLibrary/EFModel/tb_Place.cs | 22 +
.../EFModel/tb_PlanScreenConfig.cs | 22 +
.../MESClassLibrary/EFModel/tb_Plan_243.cs | 31 +
.../MESClassLibrary/EFModel/tb_Plan_247.cs | 31 +
.../MESClassLibrary/EFModel/tb_Plan_Punch.cs | 29 +
.../EFModel/tb_Plan_Punch_20200509.cs | 29 +
.../MESClassLibrary/EFModel/tb_Plastic.cs | 24 +
.../MESClassLibrary/EFModel/tb_PrintConfig.cs | 21 +
.../MESClassLibrary/EFModel/tb_PrintRecord.cs | 28 +
.../MESClassLibrary/EFModel/tb_Product.cs | 36 +
.../MESClassLibrary/EFModel/tb_Product0912.cs | 34 +
.../EFModel/tb_Product20200802.cs | 33 +
.../EFModel/tb_Product20201016.cs | 34 +
.../EFModel/tb_ProductSotckIn.cs | 22 +
.../MESClassLibrary/EFModel/tb_ProductType.cs | 22 +
.../EFModel/tb_Product_20200513.cs | 31 +
.../EFModel/tb_Product_20201110.cs | 35 +
.../EFModel/tb_Product_Injection.cs | 27 +
.../EFModel/tb_Product_Injection_20190726.cs | 26 +
.../EFModel/tb_Product_Injection_w.cs | 22 +
.../MESClassLibrary/EFModel/tb_Project.cs | 22 +
.../EFModel/tb_PunchAddress.cs | 23 +
.../EFModel/tb_PunchAndStation.cs | 26 +
.../MESClassLibrary/EFModel/tb_PunchDevice.cs | 22 +
.../EFModel/tb_PunchMFAPlan.cs | 34 +
.../EFModel/tb_PunchNGCCPlan.cs | 34 +
.../MESClassLibrary/EFModel/tb_PunchPlan.cs | 26 +
.../MESClassLibrary/EFModel/tb_PunchRecord.cs | 21 +
.../MESClassLibrary/EFModel/tb_PunchResult.cs | 27 +
.../EFModel/tb_PunchValueRecord.cs | 23 +
.../EFModel/tb_Punch_Code_Record.cs | 31 +
.../EFModel/tb_Punch_Code_Record2.cs | 23 +
.../EFModel/tb_Punch_Code_Record_20200721.cs | 26 +
.../EFModel/tb_Punch_Code_Record_20200907.cs | 26 +
.../EFModel/tb_Punch_Code_Record_BF.cs | 26 +
.../EFModel/tb_Punch_Proucting.cs | 21 +
.../MESClassLibrary/EFModel/tb_Record_243.cs | 27 +
.../EFModel/tb_Record_243_20220517.cs | 27 +
.../MESClassLibrary/EFModel/tb_Record_247.cs | 30 +
.../MESClassLibrary/EFModel/tb_ReportA1.cs | 33 +
.../MESClassLibrary/EFModel/tb_ReportF1.cs | 32 +
.../MESClassLibrary/EFModel/tb_ReportF3.cs | 23 +
.../MESClassLibrary/EFModel/tb_ReportG1.cs | 32 +
.../MESClassLibrary/EFModel/tb_ReportH1.cs | 32 +
.../EFModel/tb_ReportPaintingScreen.cs | 25 +
.../EFModel/tb_ReportPaintingScreen_bak.cs | 25 +
.../EFModel/tb_ReportPaintingScreen_pg.cs | 32 +
.../EFModel/tb_ReportPaintingScreen_pg_bak.cs | 32 +
.../MESClassLibrary/EFModel/tb_ReportTest.cs | 30 +
.../EFModel/tb_Report_FiveScreen.cs | 65 +
.../EFModel/tb_Report_FiveScreenConfig.cs | 24 +
.../EFModel/tb_Report_FiveScreenLast.cs | 25 +
.../EFModel/tb_Report_FiveScreenStandard.cs | 34 +
.../EFModel/tb_Report_FiveScreen_20191011.cs | 65 +
.../EFModel/tb_Report_FiveScreen_20191014.cs | 65 +
.../EFModel/tb_ScanAnalysis.cs | 28 +
.../EFModel/tb_ScanRecord_Laser.cs | 21 +
.../MESClassLibrary/EFModel/tb_SkidInfo.cs | 49 +
.../EFModel/tb_SkidInfo_20200904.cs | 49 +
.../EFModel/tb_SpcialNotFacStockNo.cs | 20 +
.../EFModel/tb_SpcialStockNo.cs | 20 +
.../MESClassLibrary/EFModel/tb_Station.cs | 22 +
.../EFModel/tb_StationAndCylinder.cs | 23 +
.../MESClassLibrary/EFModel/tb_StockIn.cs | 24 +
.../EFModel/tb_StockInColor.cs | 22 +
.../EFModel/tb_StockIn_20200511.cs | 24 +
.../EFModel/tb_StockIn_20210322.cs | 24 +
.../EFModel/tb_StockIn_beif.cs | 22 +
.../EFModel/tb_ToVisual_WheelBrow_243.cs | 23 +
.../EFModel/tb_ToVisual_WheelBrow_247.cs | 23 +
.../MESClassLibrary/EFModel/tb_aa.cs | 24 +
.../MESClassLibrary/EFModel/tb_reportA2.cs | 33 +
.../MESClassLibrary/EFModel/tb_test.cs | 21 +
.../MESClassLibrary/EFModel/test1.cs | 29 +
.../MESClassLibrary/EFModel/test2.cs | 24 +
.../EFModel/user_department_sel_Result.cs | 19 +
.../EFModel/user_menu_sel_Result.cs | 19 +
.../EncryptedDLL/MESClassLibrary.dll | Bin 0 -> 721920 bytes
.../MESClassLibrary/JSONTools.cs | 85 +
.../MESClassLibrary/LambdaHelper.cs | 220 +
.../MESClassLibrary/MESClassLibrary.csproj | 983 ++
.../MESClassLibrary/Model/AnalysisBarModel.cs | 16 +
.../MESClassLibrary/Model/AnalysisPieModel.cs | 14 +
.../Model/AndonButtonTypeModel.cs | 15 +
.../MESClassLibrary/Model/AndonRecordModel.cs | 18 +
.../MESClassLibrary/Model/AssemblyModel.cs | 38 +
.../Model/BadInjectionModel.cs | 17 +
.../MESClassLibrary/Model/BarCodeModel.cs | 28 +
.../MESClassLibrary/Model/BasicModel.cs | 20 +
.../MESClassLibrary/Model/BomModel.cs | 16 +
.../MESClassLibrary/Model/BoxModel.cs | 35 +
.../MESClassLibrary/Model/CheckItemModel.cs | 14 +
.../MESClassLibrary/Model/ChildTreeModel.cs | 16 +
.../MESClassLibrary/Model/ColorModel.cs | 16 +
.../Model/CommonlyInspectionModel.cs | 14 +
.../Model/CommonlyInspectionVersionModel.cs | 17 +
.../MESClassLibrary/Model/DefectModel.cs | 14 +
.../MESClassLibrary/Model/DeviceModel.cs | 14 +
.../MESClassLibrary/Model/DownRecordVO.cs | 28 +
.../MESClassLibrary/Model/EcharBarModel.cs | 15 +
.../MESClassLibrary/Model/GetNewTasksModel.cs | 51 +
.../Model/InjectionBadReasonModel.cs | 14 +
.../Model/InjectionDownReason.cs | 15 +
.../Model/InjectionDownRecordModel.cs | 20 +
.../Model/InjectionPlanModel.cs | 22 +
.../Model/InjectionRecordDownReasonModel.cs | 15 +
.../Model/Injection_DownRecordModel.cs | 18 +
.../Model/Injection_RecordModel.cs | 14 +
.../Model/InspectResultGroup.cs | 34 +
.../Model/InspectResultModel.cs | 27 +
.../MESClassLibrary/Model/JsonDataModel.cs | 14 +
.../MESClassLibrary/Model/LineModel.cs | 14 +
.../MESClassLibrary/Model/LogErrModel.cs | 20 +
.../MESClassLibrary/Model/LogSysModel.cs | 19 +
.../MESClassLibrary/Model/OperationModel.cs | 42 +
.../MESClassLibrary/Model/OperatorModel.cs | 14 +
.../Model/PaintBarCodeModel.cs | 26 +
.../Model/Paint_BucketModel.cs | 17 +
.../MESClassLibrary/Model/PartDetModel.cs | 30 +
.../MESClassLibrary/Model/PartMstrModel.cs | 60 +
.../MESClassLibrary/Model/PartRecordModel.cs | 17 +
.../MESClassLibrary/Model/PieDataModel.cs | 14 +
.../MESClassLibrary/Model/PlaceModel.cs | 14 +
.../MESClassLibrary/Model/PlasticModel.cs | 16 +
.../Model/ProductInjectionModel.cs | 16 +
.../MESClassLibrary/Model/ProductModel.cs | 14 +
.../Model/ProductOfInjectionModel.cs | 25 +
.../MESClassLibrary/Model/ProductTypeModel.cs | 21 +
.../Model/PunchAndStationModel.cs | 36 +
.../Model/PunchAndStationModel1.cs | 34 +
.../MESClassLibrary/Model/PunchPlanModel.cs | 19 +
.../MESClassLibrary/Model/PunchRecordModel.cs | 14 +
.../Model/PunchValueRecordModel.cs | 18 +
.../Model/QualifiedDayModel.cs | 15 +
.../Model/QualifiedMonthModel.cs | 15 +
.../MESClassLibrary/Model/RecordModel.cs | 28 +
.../MESClassLibrary/Model/SelectModel.cs | 14 +
.../MESClassLibrary/Model/StationModel.cs | 14 +
.../MESClassLibrary/Model/StockInModel.cs | 15 +
.../MESClassLibrary/Model/Sys_Buttons.cs | 51 +
.../MESClassLibrary/Model/Sys_NavMenuInfo.cs | 71 +
.../MESClassLibrary/Model/TESBomModel.cs | 63 +
.../MESClassLibrary/Model/TESPartDetModel.cs | 143 +
.../MESClassLibrary/Model/TreeModel.cs | 16 +
.../MESClassLibrary/Model/UserModel.cs | 21 +
.../MESClassLibrary/Model/tb_Plan_247Model.cs | 13 +
.../Model/tb_Plan_PunchModel.cs | 13 +
.../Properties/AssemblyInfo.cs | 36 +
SjMes/PunchAssemble/MESClassLibrary/Tool.cs | 240 +
.../MESClassLibrary/packages.config | 5 +
SjMes/PunchAssemble/PunchAndWeld/App.config | 53 +
.../PunchAssemble/PunchAndWeld/AutoUpdater.cs | 134 +
.../PunchAndWeld/DataSouce/ProScreenFunc.cs | 3446 +++++
.../PunchAndWeld/DataSouce/Tools.dll | Bin 0 -> 34304 bytes
.../PunchAndWeld/Form1.Designer.cs | 363 +
SjMes/PunchAssemble/PunchAndWeld/Form1.cs | 1096 ++
SjMes/PunchAssemble/PunchAndWeld/Form1.resx | 123 +
.../PunchAndWeld/FrmDoorSill.Designer.cs | 246 +
.../PunchAssemble/PunchAndWeld/FrmDoorSill.cs | 826 ++
.../PunchAndWeld/FrmDoorSill.resx | 123 +
.../PunchAndWeld/FrmDoorSillNew.Designer.cs | 413 +
.../PunchAndWeld/FrmDoorSillNew.cs | 1220 ++
.../PunchAndWeld/FrmDoorSillNew.resx | 1435 ++
.../PunchAndWeld/FrmDoorSill_214.Designer.cs | 443 +
.../PunchAndWeld/FrmDoorSill_214.cs | 1265 ++
.../PunchAndWeld/FrmDoorSill_214.resx | 1435 ++
.../FrmDoorSill_214_2.Designer.cs | 451 +
.../PunchAndWeld/FrmDoorSill_214_2.cs | 1486 +++
.../PunchAndWeld/FrmDoorSill_214_2.resx | 1438 ++
.../PunchAndWeld/FrmHybird.Designer.cs | 422 +
SjMes/PunchAssemble/PunchAndWeld/FrmHybird.cs | 570 +
.../PunchAssemble/PunchAndWeld/FrmHybird.resx | 123 +
.../PunchAndWeld/FrmHybridS.Designer.cs | 396 +
.../PunchAssemble/PunchAndWeld/FrmHybridS.cs | 1045 ++
.../PunchAndWeld/FrmHybridS.resx | 126 +
.../FrmInspection_WheelBrow.Designer.cs | 271 +
.../PunchAndWeld/FrmInspection_WheelBrow.cs | 466 +
.../PunchAndWeld/FrmInspection_WheelBrow.resx | 120 +
.../PunchAndWeld/FrmLaser.Designer.cs | 220 +
SjMes/PunchAssemble/PunchAndWeld/FrmLaser.cs | 391 +
.../PunchAssemble/PunchAndWeld/FrmLaser.resx | 123 +
.../PunchAndWeld/FrmNotPackList.Designer.cs | 73 +
.../PunchAndWeld/FrmNotPackList.cs | 47 +
.../PunchAndWeld/FrmNotPackList.resx | 120 +
.../PunchAndWeld/FrmOtherParts.Designer.cs | 443 +
.../PunchAndWeld/FrmOtherParts.cs | 886 ++
.../PunchAndWeld/FrmOtherParts.resx | 120 +
.../PunchAndWeld/FrmPackList.Designer.cs | 175 +
.../PunchAssemble/PunchAndWeld/FrmPackList.cs | 67 +
.../PunchAndWeld/FrmPackList.resx | 120 +
.../PunchAndWeld/FrmPassWord.Designer.cs | 101 +
.../PunchAssemble/PunchAndWeld/FrmPassWord.cs | 42 +
.../PunchAndWeld/FrmPassWord.resx | 120 +
.../PunchAndWeld/FrmPlan.Designer.cs | 274 +
SjMes/PunchAssemble/PunchAndWeld/FrmPlan.cs | 393 +
SjMes/PunchAssemble/PunchAndWeld/FrmPlan.resx | 120 +
.../PunchAndWeld/FrmPreNoPlan.Designer.cs | 218 +
.../PunchAndWeld/FrmPreNoPlan.cs | 68 +
.../PunchAndWeld/FrmPreNoPlan.resx | 863 ++
.../PunchAndWeld/FrmPrintOrder.Designer.cs | 131 +
.../PunchAndWeld/FrmPrintOrder.cs | 78 +
.../PunchAndWeld/FrmPrintOrder.resx | 120 +
.../PunchAndWeld/FrmProScreen.Designer.cs | 424 +
.../PunchAndWeld/FrmProScreen.cs | 1004 ++
.../PunchAndWeld/FrmProScreen.resx | 126 +
.../PunchAndWeld/FrmProScreen2.Designer.cs | 346 +
.../PunchAndWeld/FrmProScreen2.cs | 97 +
.../PunchAndWeld/FrmProScreen2.resx | 147 +
.../PunchAndWeld/FrmProScreen3.Designer.cs | 287 +
.../PunchAndWeld/FrmProScreen3.cs | 729 +
.../PunchAndWeld/FrmProScreen3.resx | 120 +
.../FrmProScreenBumper.Designer.cs | 516 +
.../PunchAndWeld/FrmProScreenBumper.cs | 729 +
.../PunchAndWeld/FrmProScreenBumper.resx | 123 +
.../FrmProScreenBumperS.Designer.cs | 538 +
.../PunchAndWeld/FrmProScreenBumperS.cs | 2060 +++
.../PunchAndWeld/FrmProScreenBumperS.resx | 123 +
.../PunchAndWeld/FrmProScreenS.Designer.cs | 429 +
.../PunchAndWeld/FrmProScreenS.cs | 1235 ++
.../PunchAndWeld/FrmProScreenS.resx | 123 +
.../FrmProScreen_WheelBrow.Designer.cs | 341 +
.../PunchAndWeld/FrmProScreen_WheelBrow.cs | 600 +
.../PunchAndWeld/FrmProScreen_WheelBrow.resx | 123 +
.../FrmProScreen_WheelBrow_New.Designer.cs | 361 +
.../FrmProScreen_WheelBrow_New.cs | 475 +
.../FrmProScreen_WheelBrow_New.resx | 120 +
.../PunchAndWeld/FrmSearchPlan.Designer.cs | 343 +
.../PunchAndWeld/FrmSearchPlan.cs | 96 +
.../PunchAndWeld/FrmSearchPlan.resx | 150 +
.../PunchAndWeld/FrmTest.Designer.cs | 59 +
SjMes/PunchAssemble/PunchAndWeld/FrmTest.cs | 132 +
SjMes/PunchAssemble/PunchAndWeld/FrmTest.resx | 120 +
.../PunchAndWeld/Img/20200428213144.png | Bin 0 -> 102753 bytes
.../PunchAndWeld/Img/Preassembly.png | Bin 0 -> 119682 bytes
.../PunchAndWeld/Img/Preassembly1.png | Bin 0 -> 44516 bytes
SjMes/PunchAssemble/PunchAndWeld/Img/new.png | Bin 0 -> 86971 bytes
.../PunchAndWeld/Interop.OPCAutomation.dll | Bin 0 -> 28672 bytes
SjMes/PunchAssemble/PunchAndWeld/LogHelper.cs | 136 +
SjMes/PunchAssemble/PunchAndWeld/OPCHelper.cs | 115 +
SjMes/PunchAssemble/PunchAndWeld/Program.cs | 84 +
.../PunchAndWeld/Properties/AssemblyInfo.cs | 36 +
.../Properties/Resources.Designer.cs | 113 +
.../PunchAndWeld/Properties/Resources.resx | 136 +
.../Properties/Settings.Designer.cs | 36 +
.../PunchAndWeld/Properties/Settings.settings | 9 +
.../PunchAndWeld/PunchAndWeld.csproj | 424 +
.../PunchAndWeld/ReportHelper.cs | 98 +
.../PunchAndWeld/Resources/20200428213144.png | Bin 0 -> 109049 bytes
.../PunchAndWeld/Resources/20200723112650.png | Bin 0 -> 92044 bytes
.../PunchAndWeld/Resources/987654341.png | Bin 0 -> 109049 bytes
.../PunchAndWeld/Resources/background.png | Bin 0 -> 127817 bytes
.../PunchAndWeld/Resources/background1.png | Bin 0 -> 118100 bytes
.../PunchAndWeld/SchTaskExtAPI.dll | Bin 0 -> 8704 bytes
.../PunchAssemble/PunchAndWeld/UC.Designer.cs | 87 +
SjMes/PunchAssemble/PunchAndWeld/UC.cs | 33 +
SjMes/PunchAssemble/PunchAndWeld/UC.resx | 120 +
SjMes/PunchAssemble/PunchAndWeld/Upload.cs | 97 +
.../Web References/WebReference/Reference.cs | 398 +
.../Web References/WebReference/Reference.map | 7 +
.../WebReference/WMSWebService.disco | 6 +
.../WebReference/WMSWebService.wsdl | 453 +
.../PunchAndWeld/signal/Punch128.csv | 17 +
.../signal/二厂冲孔模拟信号点位.png | Bin 0 -> 121229 bytes
536 files changed, 84242 insertions(+)
create mode 100644 SjMes/PunchAssemble/BBMPT.sln
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/App.config
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/StationBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Check/InspectResultBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/ExchangeCenter/GetNewTasksBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/ExchangeCenter/PartMstrBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/ExchangeCenter/PartRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/ExchangeCenter/TESBomBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/ExchangeCenter/TESPartDetBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Injection/DownReasonBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Injection/InjectionDownRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Injection/InjectionRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Inspection/CommonlyInspectionBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Inspection/CommonlyInspectionVersionBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Mistake247/AssemblyBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Mistake247/BoxBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Mistake247/MistakeBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Mistake247/Plan247BLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Mistake247/RecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Painting/InspectResultBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Painting/PaintBarCodeBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Painting/StockInBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Plan247/Plan247BLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PlanPunchBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchAdressBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchAndStationBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchDeviceBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchPartBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchPlanBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/PunchAndWeld/PunchValueRecordBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Record247/Record247BLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Report/FiveScreenBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Report/FiveScreenLastBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Report/FiveScreenStandardBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Show/AnalysisBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/Stock/StockInBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/User/Sys_ButtonsService.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/User/Sys_NavMenuService.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/BLL/User/UserBLL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Andon/AndonButtonRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Andon/AndonButtonTypeDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BaseDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/BomDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/ColorDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/DefectDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/InjectionPlanDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/OperatorDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/ProductDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/ProductOfInjectionDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/ProductTypeDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/BasicInfo/StationDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Check/InspectResultDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/DataTableExtend.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/ExchangeCenter/GetNewTasksDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/ExchangeCenter/PartMstrDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/ExchangeCenter/PartRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/ExchangeCenter/TESBomDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/ExchangeCenter/TESPartDetDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Injection/DownReasonDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Injection/InjectionDownRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Injection/InjectionRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Mistake247/BoxDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Mistake247/MistakeDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Mistake247/Plan247DAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Mistake247/RecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/Plan247/Plan247DAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchAdressDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchAndStationDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchDeviceDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchPartDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchPlanDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/PunchAndWeld/PunchValueRecordDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/SqlHelper.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/User/Sys_ButtonsData.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/User/Sys_NavMenuData.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/User/UserDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/painting/InspectResultDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/painting/PaintBarCodeDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/DAL/painting/StockInDAL.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.Context.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.Context.tt
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.Designer.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.edmx
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.edmx.diagram
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/BBMPT.tt
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogErr.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_202001_04.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_202003.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_202004.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_202005.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_20200605.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_20200610.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_202008.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/LogSys_20210322.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_BLOB_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_CALENDARS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_CRON_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_FIRED_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_JOB_DETAILS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_LOCKS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_PAUSED_TRIGGER_GRPS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_SCHEDULER_STATE.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_SIMPLE_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_SIMPROP_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/QRTZ_TRIGGERS.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/TA_DEPT.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/TES_BOM.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/TES_PART_MSTR.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_PaintInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_Buttons.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_NavMenu.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_Power.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_Role.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_RoleLinkPower.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_UserRole.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_Users.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/T_Sys_Users_NavMenu.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_authority.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_authority_object.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_backup_node.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_base_message.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_base_output.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_block_ip.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_conf_classname.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_conf_entity.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_conf_xmlentity.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_custom_role.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_dep_role.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_department.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_extra_property.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_favorite_entry.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_homepage_expand.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_international.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_last_login.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_login_lock.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_mobile_device.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_mobile_push_message.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_class.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_client_notice.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_email.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_ftp.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_mount.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_platform_msg.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_print.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_sftp.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_output_sms.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_param_template.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_post.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_print_offset.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_print_offset_ip_relate.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_process_expand.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_process_message.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_remote_design_auth.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_report_expand.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_schedule_output.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_schedule_record.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_schedule_task.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_schedule_task_param.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_cluster_size.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_col_idx_conf.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_config_entity.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_metadata.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_seg_location.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_segments.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_service_info.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_tab_idx_conf.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_swift_table_path.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_system_message.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_user.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_user_role_middle.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_vcs.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow_log.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow_node.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow_stash_data.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow_task.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_workflow_task_impl.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/fine_write_stash.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_AndonButtonType.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_AndonRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Assembly_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Assembly_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Bad_Injection.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_BarCode.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Bom.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Bom_20190726.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Box_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Box_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Box_Record.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Box_WheelBrow.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_BucketInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_CheckItem.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Color.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Color_20191008.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Color_20201101.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_CommonlyInspection.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_CommonlyInspectionRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_CommonlyInspectionVersion.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Config.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Cylinder.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_CylinderAndRaw.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Defect.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Device.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Factory.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_FinishProduct.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_HybridPlan.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_HybridScanRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ImgVideo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Inhection_DownReason.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InjectPlanReport.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InjectionPlan.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Injection_DownRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Injection_DownTime.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Injection_DownType.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Injection_Record.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InspectResult.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InspectResult_20190902.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InspectResult_20200717.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InspectResult_20201021.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_InspectResult_20210322.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_LayerAndBC.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Line.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Location.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Machine.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Mistake_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Mistake_243_bak.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Mistake_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ModelCount.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ModelInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Model_Product.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Model_Update.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Operator.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PaintBarCode.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PaintInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PaintPerson.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PaintReason.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PaintScanRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Paint_Bucket.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PartRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Place.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PlanScreenConfig.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Plan_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Plan_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Plan_Punch.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Plan_Punch_20200509.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Plastic.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PrintConfig.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PrintRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product0912.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product20200802.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product20201016.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ProductSotckIn.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ProductType.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product_20200513.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product_20201110.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product_Injection.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product_Injection_20190726.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Product_Injection_w.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Project.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchAddress.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchAndStation.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchDevice.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchMFAPlan.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchNGCCPlan.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchPlan.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchResult.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_PunchValueRecord.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Code_Record.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Code_Record2.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Code_Record_20200721.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Code_Record_20200907.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Code_Record_BF.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Punch_Proucting.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Record_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Record_243_20220517.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Record_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportA1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportF1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportF3.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportG1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportH1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportPaintingScreen.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportPaintingScreen_bak.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportPaintingScreen_pg.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportPaintingScreen_pg_bak.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ReportTest.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreen.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreenConfig.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreenLast.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreenStandard.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreen_20191011.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Report_FiveScreen_20191014.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ScanAnalysis.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ScanRecord_Laser.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_SkidInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_SkidInfo_20200904.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_SpcialNotFacStockNo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_SpcialStockNo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_Station.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StationAndCylinder.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StockIn.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StockInColor.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StockIn_20200511.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StockIn_20210322.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_StockIn_beif.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ToVisual_WheelBrow_243.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_ToVisual_WheelBrow_247.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_aa.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_reportA2.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/tb_test.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/test1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/test2.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/user_department_sel_Result.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EFModel/user_menu_sel_Result.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/EncryptedDLL/MESClassLibrary.dll
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/JSONTools.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/LambdaHelper.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/MESClassLibrary.csproj
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/AnalysisBarModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/AnalysisPieModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/AndonButtonTypeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/AndonRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/AssemblyModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/BadInjectionModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/BarCodeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/BasicModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/BomModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/BoxModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/CheckItemModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ChildTreeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ColorModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/CommonlyInspectionModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/CommonlyInspectionVersionModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/DefectModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/DeviceModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/DownRecordVO.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/EcharBarModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/GetNewTasksModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InjectionBadReasonModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InjectionDownReason.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InjectionDownRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InjectionPlanModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InjectionRecordDownReasonModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/Injection_DownRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/Injection_RecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InspectResultGroup.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/InspectResultModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/JsonDataModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/LineModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/LogErrModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/LogSysModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/OperationModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/OperatorModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PaintBarCodeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/Paint_BucketModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PartDetModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PartMstrModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PartRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PieDataModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PlaceModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PlasticModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ProductInjectionModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ProductModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ProductOfInjectionModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/ProductTypeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PunchAndStationModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PunchAndStationModel1.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PunchPlanModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PunchRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/PunchValueRecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/QualifiedDayModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/QualifiedMonthModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/RecordModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/SelectModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/StationModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/StockInModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/Sys_Buttons.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/Sys_NavMenuInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/TESBomModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/TESPartDetModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/TreeModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/UserModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/tb_Plan_247Model.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Model/tb_Plan_PunchModel.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Properties/AssemblyInfo.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/Tool.cs
create mode 100644 SjMes/PunchAssemble/MESClassLibrary/packages.config
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/App.config
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/AutoUpdater.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/DataSouce/ProScreenFunc.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/DataSouce/Tools.dll
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Form1.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Form1.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Form1.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSillNew.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSillNew.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybird.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybird.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybird.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybridS.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybridS.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmHybridS.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmLaser.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmLaser.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmLaser.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmNotPackList.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmNotPackList.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmNotPackList.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmOtherParts.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmOtherParts.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmOtherParts.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPackList.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPackList.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPackList.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPassWord.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPassWord.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPassWord.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPlan.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPlan.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPlan.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPreNoPlan.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPrintOrder.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPrintOrder.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmPrintOrder.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen2.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen2.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen2.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen3.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen3.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen3.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumper.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumper.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenS.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenS.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreenS.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow_New.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow_New.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow_New.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmSearchPlan.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmSearchPlan.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmSearchPlan.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmTest.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmTest.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/FrmTest.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Img/20200428213144.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Img/Preassembly.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Img/Preassembly1.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Img/new.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Interop.OPCAutomation.dll
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/LogHelper.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/OPCHelper.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Program.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Properties/Resources.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Properties/Resources.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Properties/Settings.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Properties/Settings.settings
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/PunchAndWeld.csproj
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/ReportHelper.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Resources/20200428213144.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Resources/20200723112650.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Resources/987654341.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Resources/background.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Resources/background1.png
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/SchTaskExtAPI.dll
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/UC.Designer.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/UC.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/UC.resx
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Upload.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Web References/WebReference/Reference.cs
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Web References/WebReference/Reference.map
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Web References/WebReference/WMSWebService.disco
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/Web References/WebReference/WMSWebService.wsdl
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/signal/Punch128.csv
create mode 100644 SjMes/PunchAssemble/PunchAndWeld/signal/二厂冲孔模拟信号点位.png
diff --git a/SjMes/PunchAssemble/BBMPT.sln b/SjMes/PunchAssemble/BBMPT.sln
new file mode 100644
index 0000000..b46ee13
--- /dev/null
+++ b/SjMes/PunchAssemble/BBMPT.sln
@@ -0,0 +1,42 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34330.188
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MESClassLibrary", "MESClassLibrary\MESClassLibrary.csproj", "{867989D8-6837-41DC-9BF1-4658F5D6CFEF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0D128182-FB8C-4E0B-A42F-DF3767E4DE39}"
+ ProjectSection(SolutionItems) = preProject
+ 数据结构修改记录.txt = 数据结构修改记录.txt
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PunchAndWeld", "PunchAndWeld\PunchAndWeld.csproj", "{D6371D99-5220-4A51-A72C-966FB4BFCD2C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|x86.ActiveCfg = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {52EF8F7E-6AC9-4400-82F1-31F70143C867}
+ EndGlobalSection
+EndGlobal
diff --git a/SjMes/PunchAssemble/MESClassLibrary/App.config b/SjMes/PunchAssemble/MESClassLibrary/App.config
new file mode 100644
index 0000000..f80c656
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/App.config
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs
new file mode 100644
index 0000000..e7ffbd1
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.Andon;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.Andon
+{
+ public class AndonButtonRecordBLL
+ {
+ AndonButtonRecordDAL da=new AndonButtonRecordDAL();
+
+ public bool InsertInfo(AndonRecordModel md)
+ {
+ try
+ {
+ return da.InsertInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool UpdateInfo(AndonRecordModel md)
+ {
+ try
+ {
+ return da.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs
new file mode 100644
index 0000000..9aa1828
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
+using MESClassLibrary.DAL.Andon;
+
+namespace MESClassLibrary.BLL.Andon
+{
+ public class AndonButtonTypeBLL
+ {
+ public DataTable SearchInfoByName(string buttonName)
+ {
+ try
+ {
+ AndonButtonTypeDAL da = new AndonButtonTypeDAL();
+
+ return da.SearchInfoByName(buttonName);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs
new file mode 100644
index 0000000..3621ab5
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs
@@ -0,0 +1,178 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL
+{
+ public class BasicBLL where T : class, new()
+ {
+ BaseDAL db = new BaseDAL();
+ /// 新增信息
+ public bool AddInfo(T md)
+ {
+ try
+ {
+ if (db.Add(md) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ /// 修改信息
+ public bool UpdateInfo(T md, params string[] proNames)
+ {
+ try
+ {
+ //T u = new T() { uId = 1, uLoginName = "asdfasdf" };
+ if (db.Modify(md, proNames) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ /// 删除信息
+ public bool DelInfo(T md)
+ {
+ try
+ {
+ if (db.Del(md) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ public List SearchInfo(int page, int pagesize, out int total)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.CreateEqual("IsUseing", 1)).ToList();
+ total = list.Count;
+ int Skipcount = (page - 1) * pagesize;
+ return list.Skip(Skipcount).Take(pagesize).ToList();
+ }
+ catch (Exception ex)
+ {
+ total = 0;
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public List SearchInfoByKey(string keyname, object keyvalue)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.CreateEqual(keyname, keyvalue)).ToList();
+ return list;
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+
+ public List SearchInfoContains(string keyname, string keyvalue)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.GetContains(keyname, keyvalue)).ToList();
+ return list;
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+
+
+
+ public List SearchInfoAll(int page, int pagesize, out int total)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.True()).ToList();
+ total = list.Count;
+ int Skipcount = (page - 1) * pagesize;
+ return list.Skip(Skipcount).Take(pagesize).ToList();
+ }
+ catch (Exception ex)
+ {
+ total = 0;
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public T SearchInfoByID(string ID)
+ {
+ try
+ {
+ var list = db.Find(ID);
+ return list;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+
+ }
+ public List SearchAllInfo()
+ {
+ try
+ {
+ return db.GetListBy(LambdaHelper.True()).ToList();
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public List SearchInfoByTime(string cname, DateTime stime, DateTime etime)
+ {
+ try
+ {
+ IQueryable list = db.GetListBy(LambdaHelper.CreateCompareToLater(cname, stime)).AsQueryable();
+ list = list.Where(LambdaHelper.CreateCompareToEarlier(cname, etime));
+ return list.ToList();
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
new file mode 100644
index 0000000..7a2f8f6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BadInjectionBLL
+ {
+ BadInjectionDAL db=new BadInjectionDAL();
+
+ public bool Add_Info(BadInjectionModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchByCode(string code)
+ {
+ try
+ {
+ return db.SearchByCode(code);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
new file mode 100644
index 0000000..1f46252
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BarCodeBLL
+ {
+ BarCodeDAl db = new BarCodeDAl();
+
+ public DataTable SearchInfoByStock(string StockNo)
+ {
+ try
+ {
+ return db.SearchInfoByStock(StockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Add_Info(BarCodeModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchInfo(string stationNo)
+ {
+ try
+ {
+ return db.SearchInfo(stationNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoAll()
+ {
+ try
+ {
+ return db.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCode()
+ {
+ try
+ {
+ return db.SearchBarCode();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCodeByOne(string OneBarCode)
+ {
+ try
+ {
+ return db.SearchBarCodeByOne(OneBarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCodeByTwo(string BarCode)
+ {
+ try
+ {
+ return db.SearchBarCodeByTwo(BarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchSerialNoByBarCode(string Code)
+ {
+ try
+ {
+ return db.SearchSerialNoByBarCode(Code);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByBarCode(string BarCode)
+ {
+ try
+ {
+ return db.SearchInfoByBarCode(BarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Update_Info(BarCodeModel md)
+ {
+ try
+ {
+ return db.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool DelBarCode(BarCodeModel md)
+ {
+ try
+ {
+ return db.DelBarCode(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchOneBarCode(string barCode,int a)
+ {
+ try
+ {
+ return db.SearchOneBarCode(barCode,a);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
new file mode 100644
index 0000000..3ee0387
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
@@ -0,0 +1,271 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BomBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Bom md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PartNo1", md.PartNo1);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.BomID != md.BomID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Bom md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PartNo1 == md.PartNo1 && p.BomID != md.BomID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "PartNo1";
+ proNames[1] = "PartNo2";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Bom md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string partNo1)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(partNo1))
+ {
+ list = list.Where(p => p.PartNo1.Contains(partNo1)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ List modelList = new List();
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ BomModel dm = Tool.Mapper(item);
+ var info = s_list.FirstOrDefault(p => p.PartNo == item.PartNo1);
+ if (info != null)
+ {
+ dm.ProductName1 = info.ProductName;
+ }
+
+ var info2 = s_list.FirstOrDefault(p => p.PartNo == item.PartNo2);
+ if (info2 != null)
+ {
+ dm.ProductName2 = info2.ProductName;
+ }
+
+ modelList.Add(dm);
+ }
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Bom SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public DataTable SearchBom(string PartNo)
+ {
+ BomDAL dal=new BomDAL();
+ try
+ {
+ return dal.SearchBom(PartNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable Search(string partNo1, string partNo2)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.Search(partNo1, partNo2);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool AddInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool updateInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.updateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool DelInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
new file mode 100644
index 0000000..89d654a
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
@@ -0,0 +1,184 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class BucketInfoBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("BucketCode", md.BucketCode);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.BucketCode == md.BucketCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "BucketCode";
+ proNames[1] = "BucketName";
+ proNames[2] = "IsUsing";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string BucketCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(BucketCode))
+ {
+ list = list.Where(p => p.BucketCode.Contains(BucketCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_BucketInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.BucketCode+"--"+ item.BucketName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
new file mode 100644
index 0000000..9267efd
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
@@ -0,0 +1,198 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class CheckItemBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string CheckContent, string DeviceID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(DeviceID))
+ {
+ list = list.Where(p => p.DeviceID == DeviceID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(CheckContent))
+ {
+ list = list.Where(p => p.CheckContent.Contains(CheckContent)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ CheckItemModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.DeviceID == item.DeviceID);
+ if (info != null)
+ {
+ dm.DeviceName = info.DeviceName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_CheckItem md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("CheckContent", md.CheckContent);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.DeviceID.Equals(md.DeviceID)).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_CheckItem md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.CheckContent == md.CheckContent && p.DeviceID == md.DeviceID && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "DeviceID";
+ proNames[1] = "CheckContent";
+ proNames[2] = "CheckVersion";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_CheckItem md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+
+ public string GetTreeData(string deviceID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ BasicBLL li_db = new BasicBLL();
+ List trlist = new List();
+ TreeModel tr = new TreeModel();
+ tr.id = "-1";
+ tr.text = "点检项";
+ tr.state = "open";
+ var li_list = li_db.SearchAllInfo().Where(p => p.DeviceID.Equals(deviceID)).ToList();
+ var queryData = from a in li_list
+ select new ChildTreeModel
+ {
+ id = a.ID,
+ text = a.CheckContent
+ };
+ List clist = queryData.ToList();
+ if (clist.Count > 0)
+ {
+ tr.children = clist;
+ trlist.Add(tr);
+ }
+ jsonStr = JSONTools.ScriptSerialize>(trlist);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
new file mode 100644
index 0000000..4245237
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
@@ -0,0 +1,214 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using MESClassLibrary.DAL.BasicInfo;
+
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class ColorBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Color md)
+ {
+ try
+ {
+ //var list = db.SearchInfoByKey("ColorCode", md.ColorCode);//判断是否有重复数据
+ //if (list != null)
+ //{
+ // if (list.Where(p => p.ID != md.ID).Count() > 0)
+ // {
+ // return false;
+ // }
+
+ //}
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Color md)
+ {
+ try
+ {
+ //var list = db.SearchAllInfo().Where(p => p.ColorCode == md.ColorCode && p.ID != md.ID).ToList();//判断是否有重复数据
+ //if (list.Count > 0)
+ //{
+ // return false;
+ //}
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "ColorCode";
+ proNames[1] = "ColorNo";
+ proNames[2] = "ColorQQCode";
+ proNames[3] = "Des";
+ proNames[4] = "ColorDQCode";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Color md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize,string ColorCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(ColorCode))
+ {
+ list = list.Where(p => p.ColorCode.Contains(ColorCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Color SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().Select(p=>p.Des).Distinct().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item;
+ md.valueField = item;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public DataTable SearchAll()
+ {
+ ColorDAL da = new ColorDAL();
+ try
+ {
+ return da.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchByName(string color)
+ {
+ ColorDAL da = new ColorDAL();
+ try
+ {
+ return da.SearchByName(color);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
new file mode 100644
index 0000000..1e7b3f0
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
@@ -0,0 +1,181 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DefectBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DefectName, string LineID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(LineID))
+ {
+ list = list.Where(p => p.LineID == LineID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(DefectName))
+ {
+ list = list.Where(p => p.DefectName.Contains(DefectName)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ DefectModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.LineID == item.LineID);
+ if (info != null)
+ {
+ dm.LineName = info.LineName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Defect md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("DefectName", md.DefectName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Defect md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DefectName == md.DefectName && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "LineID";
+ proNames[1] = "DefectName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Defect md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+
+ public DataTable SearchInfo(string LineID)
+ {
+ DefectDAL da=new DefectDAL();
+ try
+ {
+ return da.SearchInfoAll(LineID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
new file mode 100644
index 0000000..281c860
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
@@ -0,0 +1,144 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DeptBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DeptName)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(DeptName))
+ {
+ list = list.Where(p => p.DeptName.Contains(DeptName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(TA_DEPT md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("LineName", md.DeptName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.GUID != md.GUID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(TA_DEPT md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DeptName == md.DeptName && p.GUID != md.GUID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "DeptCode";
+ proNames[1] = "DeptName";
+ proNames[2] = "Remark";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(TA_DEPT md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
new file mode 100644
index 0000000..4b9d94c
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
@@ -0,0 +1,251 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DeviceBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DeviceNo, string StationID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID == StationID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(DeviceNo))
+ {
+ list = list.Where(p => p.DeviceNo.Contains(DeviceNo)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List StationList = new List();
+ BasicBLL pl_db = new BasicBLL();
+ var pl_list = pl_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ DeviceModel dm = Tool.Mapper(item);
+ var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (info != null)
+ {
+ dm.StationNo = info.StationNo;
+ }
+ StationList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = StationList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+
+
+ public string SearchInfoByID(string DeviceID) {
+ try
+ {
+ string jsonStr = "[]";
+ tb_Device info = db.SearchInfoByID(DeviceID);
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Device md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("DeviceNo", md.DeviceNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.DeviceID != md.DeviceID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Device md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DeviceNo == md.DeviceNo && p.DeviceID != md.DeviceID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[6];
+ proNames[0] = "StationID";
+ proNames[1] = "DeviceNo";
+ proNames[2] = "DeviceName";
+ proNames[3] = "FixNo";
+ proNames[4] = "Des";
+ proNames[5] = "DeviceModel";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Device md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public string QueryForComboboxByLineID(string fl_id)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ if (fl_id != null && fl_id != "")
+ {
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo().Where(p => p.LineID == fl_id).ToList();//判断是否有重复数据
+ if (s_list.Count > 0)
+ {
+ string[] arr = s_list.Select(p => p.StationID).ToArray();
+ list = list.Where(p => arr.Contains(p.StationID)).ToList();
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ }
+ return "";
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public string QueryForComboboxByStationID(string fl_id)
+ {
+ try
+ {
+ string jsonStr = "[]";
+
+ if (fl_id != null && fl_id != "")
+ {
+ var list = db.SearchAllInfo().Where(p => p.StationID == fl_id).ToList();//判断是否有重复数据
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ return "";
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
new file mode 100644
index 0000000..68ec1a7
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
@@ -0,0 +1,148 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class FactoryBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string FactoryName)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+
+ if (!String.IsNullOrEmpty(FactoryName))
+ {
+ list = list.Where(p => p.FactoryName.Contains(FactoryName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Factory md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("FactoryName", md.FactoryName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.FactoryID != md.FactoryID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Factory md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.FactoryName == md.FactoryName && p.FactoryID != md.FactoryID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "FactoryName";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Factory md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
new file mode 100644
index 0000000..096c2fe
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
@@ -0,0 +1,141 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ImgVideoBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ImgVideo md)
+ {
+ try
+ {
+
+ var list = db.SearchInfoByKey("fileName", md.fileName);//判断是否有重复数据
+ if (list != null)
+ {
+ return false;
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ImgVideo md)
+ {
+ try
+ {
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "fileUrl";
+ proNames[1] = "fileName";
+ proNames[2] = "UpdateTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ImgVideo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = ef.tb_ImgVideo.OrderByDescending(p=>p.CreateTime).ToList();
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_ImgVideo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
new file mode 100644
index 0000000..31fc881
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
@@ -0,0 +1,391 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Data;
+using System.Data.SqlClient;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class InjectionPlanBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+ InjectionPlanDAL dal = new InjectionPlanDAL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[8];
+ proNames[0] = "StationID";
+ proNames[1] = "BeginTime";
+ proNames[2] = "StockNo";
+ proNames[3] = "PlanCount";
+ proNames[4] = "EndTime";
+ proNames[5] = "PlanDate";
+ proNames[6] = "RealCycle";
+ proNames[7] = "PartNo";
+
+
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stationID, string stockNo)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo().Where(p => p.IsFinish != 1).ToList();
+ if (!String.IsNullOrEmpty(stationID))
+ {
+ list = list.Where(p => p.StationID.Equals(stationID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ list = list.OrderBy(p => p.BeginTime).ToList();
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL station_db = new BasicBLL();
+ var station_list = station_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ InjectionPlanModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ dm.ProductName = product_info.ProductName;
+ }
+
+ var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (station_info != null)
+ {
+ dm.StationNo = station_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string SearchInfoAll2(string page, string pagesize, string stationID, string stockNo, string StartTime, string EndTime)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ total = dal.SearchByTimeCount(stationID, stockNo, StartTime, EndTime);
+ DataTable dt = dal.SearchByTime(Convert.ToInt32(page), Convert.ToInt32(pagesize), stationID, stockNo, StartTime, EndTime);
+
+ List list = Tool.ConvertTo(dt).ToList();
+
+ //List list = ef.tb_InjectionPlan.Where(p => DateTime.Parse(p.BeginTime) >= stime && DateTime.Parse(p.EndTime) <= etime).ToList();
+
+
+ if (!String.IsNullOrEmpty(stationID))
+ {
+ list = list.Where(p => p.StationID.Equals(stationID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ list = list.OrderBy(p => p.BeginTime).ToList();
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL station_db = new BasicBLL();
+ var station_list = station_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ InjectionPlanModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ dm.ProductName = product_info.ProductName;
+ }
+
+ var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (station_info != null)
+ {
+ dm.StationNo = station_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public bool UpdateInfo2(tb_InjectionPlan md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "workClass";
+ proNames[1] = "JK_Weight";
+ proNames[2] = "Waste_Weight";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_InjectionPlan SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public String GetEndTime(tb_InjectionPlan md)
+ {
+ try
+ {
+ BasicBLL Plastic_db = new BasicBLL();
+
+ var info = from c in Plastic_db.SearchAllInfo()
+ where c.StockNo == md.StockNo && c.StationID == md.StationID && c.IsBackup == 1
+ select c.CycleTime;
+
+ if (info.FirstOrDefault() != null)
+ {
+ double seconds = Convert.ToDouble(info.FirstOrDefault().Value) * Convert.ToDouble(md.PlanCount);
+ return Convert.ToDateTime(md.BeginTime).AddSeconds(seconds).ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ return md.BeginTime;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public DataTable SearchInfoByName(string StationID)
+ {
+ try
+ {
+ return dal.SearchPlanByStation(StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ public DataTable NextSearchInfoByName(string StationID)
+ {
+ try
+ {
+ return dal.NextSearchPlanByStation(StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool UpdateFinish(InjectionPlanModel md)
+ {
+ InjectionPlanDAL dal = new InjectionPlanDAL();
+ try
+ {
+ return dal.UpdateFinish(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+
+ public string GetStartTime(string StationID)
+ {
+
+ var bf = db.SearchInfoByKey("StationID", StationID).OrderByDescending(p => p.EndTime).FirstOrDefault();
+ if (bf != null)
+ {
+ return bf.EndTime;
+ }
+
+ return "";
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
new file mode 100644
index 0000000..58d9540
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
@@ -0,0 +1,170 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class LineBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string LineName, string PlaceID, string userID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ //数据权限
+ //BasicBLL userdb = new BasicBLL();
+ //T_Sys_Users user = userdb.SearchInfoByID(userID);
+ //List list = db.SearchInfoContains("LineName", user.Department);
+
+ if (!String.IsNullOrEmpty(PlaceID))
+ {
+ list = list.Where(p => p.PlaceID == PlaceID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(LineName))
+ {
+ list = list.Where(p => p.LineName.Contains(LineName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ LineModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.PlaceID == item.PlaceID);
+ if (info != null)
+ {
+ dm.PlaceName = info.PlaceName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Line md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("LineName", md.LineName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.LineID != md.LineID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Line md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.LineName == md.LineName && p.LineID != md.LineID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "PlaceID";
+ proNames[1] = "LineName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Line md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
new file mode 100644
index 0000000..a38c035
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
@@ -0,0 +1,184 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class MachineBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Machine md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("MachineNo", md.MachineNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.MachineID != md.MachineID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Machine md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.MachineNo == md.MachineNo && p.MachineID != md.MachineID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "MachineNo";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Machine md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string machineNo)
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(machineNo))
+ {
+ list = list.Where(p => p.MachineNo.Contains(machineNo)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Machine SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ //下拉框查询方法
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
new file mode 100644
index 0000000..17797de
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
@@ -0,0 +1,208 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ModelInfoBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("ModelNo", md.ModelNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.ModelNo == md.ModelNo && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[14];
+ proNames[0] = "ModelName";
+ proNames[1] = "ModelNo";
+ proNames[2] = "PermanentAssetsNo";
+ proNames[3] = "Tonnage";
+ proNames[4] = "ServiceLife";
+ proNames[5] = "Supplier";
+ proNames[6] = "PartWeight";
+ proNames[7] = "InjectionPeriod";
+ proNames[8] = "LocatingRingSize";
+ proNames[9] = "OutForm";
+ proNames[10] = "ModelWeight";
+ proNames[11] = "RunnerForm";
+ proNames[12] = "ModelCavityNo";
+ proNames[13] = "ModelSize";
+
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string ModelNo)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(ModelNo))
+ {
+ list = list.Where(p => p.ModelNo.Contains(ModelNo)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_ModelInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().OrderBy(p => p.ModelNo).ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.ModelName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ //public DataTable SearchAll()
+ //{
+ // ColorDAL da = new ColorDAL();
+ // try
+ // {
+ // return da.SearchInfoAll();
+ // }
+ // catch (Exception ex)
+ // {
+ // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ // return null;
+ // }
+ //}
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
new file mode 100644
index 0000000..199d30b
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
@@ -0,0 +1,137 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class ModelUpdateBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddUpdateInfo(tb_Model_Update md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Model_Update md)
+ {
+ try
+ {
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "Purpose";
+ proNames[1] = "State";
+ proNames[2] = "Supplier";
+ proNames[3] = "Remarks";
+ proNames[4] = "AddTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Model_Update md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string ModelID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchInfoByKey("ModelID", ModelID).OrderByDescending(p => p.AddTime).ToList();
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Model_Update SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
new file mode 100644
index 0000000..20e13c6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.Model;
+using MESClassLibrary.DAL.BasicInfo;
+using System.Data;
+using System.Data.SqlClient;
+using System.Reflection;
+using MESClassLibrary.EFModel;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class OperatorBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ OperatorDAL dal = new OperatorDAL();
+
+ public DataTable SearchInfoByName(string OperatorName, string StationID)
+ {
+ try
+ {
+ return dal.SearchInfoByName(OperatorName, StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+
+ public DataTable SearchInfoByNameAndPsw(string OperatorName, string StationID, string psw)
+ {
+ try
+ {
+ return dal.SearchInfoByNameAndPsw(OperatorName, StationID, psw);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string OperatorName, string StationID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID.Equals(StationID)).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(OperatorName))
+ {
+ list = list.Where(p => p.OperatorName.Contains(OperatorName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List StationList = new List();
+ BasicBLL pl_db = new BasicBLL();
+ var pl_list = pl_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ OperatorModel dm = Tool.Mapper(item);
+ var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (info != null)
+ {
+ dm.StationNo = info.StationNo;
+ }
+ StationList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = StationList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Operator md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("OperatorNo", md.OperatorNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.OperatorID != md.OperatorID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Operator md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.OperatorNo == md.OperatorNo && p.OperatorID != md.OperatorID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "StationID";
+ proNames[1] = "OperatorNo";
+ proNames[2] = "OperatorName";
+ proNames[3] = "OperatorPsw";
+ proNames[4] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Operator md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
new file mode 100644
index 0000000..830fe66
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
@@ -0,0 +1,335 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class PaintInfoBLL
+ {
+ BasicBLL dbPB = new BasicBLL();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PaintCode", md.PaintCode);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PaintCode == md.PaintCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "PaintCode";
+ proNames[1] = "PaintName";
+ proNames[2] = "PaintModel";
+ //proNames[3] = "UnitCode";
+ proNames[3] = "CarModelCode";
+ proNames[4] = "IsUsing";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string PaintCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(PaintCode))
+ {
+ list = list.Where(p => p.PaintCode.Contains(PaintCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_PaintInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.PaintCode + "--" + item.PaintName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+
+
+ public string SearchRelation(string page, string pagesize, string PaintID, string BucketID)
+ {
+
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+
+ List list = dbPB.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(PaintID))
+ {
+ list = list.Where(p => p.PaintID == PaintID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(BucketID))
+ {
+ list = list.Where(p => p.BucketID == BucketID).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ List modelList = new List();
+
+ #region 联查
+ BasicBLL PaintInfo_db = new BasicBLL();
+ var PaintInfo_list = PaintInfo_db.SearchAllInfo();
+
+ BasicBLL BucketInfo_db = new BasicBLL();
+ var BucketInfo_list = BucketInfo_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ Paint_BucketModel dm = Tool.Mapper(item);
+ var PaintInfo_info = PaintInfo_list.FirstOrDefault(p => p.ID == item.PaintID);
+ if (PaintInfo_info != null)
+ {
+ dm.PaintCode = PaintInfo_info.PaintCode;
+ dm.PaintName = PaintInfo_info.PaintName;
+ }
+
+ var BucketInfo_info = BucketInfo_list.FirstOrDefault(p => p.ID == item.BucketID);
+ if (BucketInfo_info != null)
+ {
+ dm.BucketCode = BucketInfo_info.BucketCode;
+ dm.BucketName = BucketInfo_info.BucketName;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+ return dbPB.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.ID != md.ID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "PaintID";
+ proNames[1] = "BucketID";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return dbPB.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ public bool DeleteRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ List ef = dbPB.SearchInfoByKey("ID", md.ID);
+ if (ef!=null && ef.Count>0)
+ {
+ return dbPB.DelInfo(ef.First());
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
new file mode 100644
index 0000000..52b4c86
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
@@ -0,0 +1,165 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class PlaceBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string PlaceName, string FactoryID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(FactoryID))
+ {
+ list = list.Where(p => p.FactoryID == FactoryID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(PlaceName))
+ {
+ list = list.Where(p => p.PlaceName.Contains(PlaceName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ PlaceModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.FactoryID == item.FactoryID);
+ if (info != null)
+ {
+ dm.FactoryName = info.FactoryName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Place md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PlaceName", md.PlaceName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.PlaceID != md.PlaceID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Place md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PlaceName == md.PlaceName && p.PlaceID != md.PlaceID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "FactoryID";
+ proNames[1] = "PlaceName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Place md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs
new file mode 100644
index 0000000..83d91b4
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs
@@ -0,0 +1,238 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class PlasticBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Plastic md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("StationID", md.StationID);//判断是否有重复数据
+ if (list != null && list.Count > 0)
+ {
+ if (list.Where(p => p.StockNo.Equals(md.StockNo)).Count() > 0)
+ {
+ return false;
+ }
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Plastic md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "CycleTime";
+ proNames[1] = "StationID";
+ proNames[2] = "IsBackup";
+ proNames[3] = "Weight";
+ proNames[4] = "OpenDebugTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Plastic md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stockNo, string partNo, string StationID)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo != null && p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID.Equals(StationID)).ToList();
+ }
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL machine_db = new BasicBLL();
+ var machine_list = machine_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ PlasticModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ }
+
+ var machine_info = machine_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (machine_info != null)
+ {
+ dm.StationNo = machine_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+ if (!String.IsNullOrEmpty(partNo))
+ {
+ modelList = modelList.Where(p => p.PartNo != null && p.PartNo.Contains(partNo)).ToList();
+ }
+
+ total = modelList.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ modelList = modelList.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Plastic SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+
+ public string QueryForCombobox(string StationID)
+ {
+ try
+ {
+
+ var info = from m in ef.tb_Plastic
+ join s in ef.tb_Product on m.StockNo equals s.StockNo into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where m.StationID == StationID
+ select new { c_id = grp.StockNo, c_text = grp.PartNo + "--" + grp.ProductName, c_name = grp.StockNo + "--" + grp.ProductName };
+
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
new file mode 100644
index 0000000..99ce043
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
@@ -0,0 +1,443 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Data;
+using System.Data.SqlClient;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Product md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("StockNo", md.StockNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ProductID != md.ProductID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Product md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.StockNo == md.StockNo && p.ProductID != md.ProductID && p.ProductID != md.ProductID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[10];
+ proNames[0] = "ProductTypeID";
+ proNames[1] = "PartName";
+ proNames[2] = "ProductName";
+ proNames[3] = "ColorName";
+ proNames[4] = "PartNo";
+ proNames[5] = "Rows";
+ proNames[6] = "Cols";
+ proNames[7] = "Layers";
+ proNames[8] = "Des";
+ proNames[9] = "isImport";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ md.PicturePath = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Product md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stockNo, string productTypeID, string productName, string partNo)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo != null && p.StockNo.Contains(stockNo)).ToList();
+ }
+ if (!String.IsNullOrEmpty(productTypeID))
+ {
+ list = list.Where(p => p.ProductTypeID.Equals(productTypeID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(productName))
+ {
+ list = list.Where(p => p.ProductName != null && p.ProductName.Contains(productName)).ToList();
+ }
+ if (!String.IsNullOrEmpty(partNo))
+ {
+ list = list.Where(p => p.PartNo != null && p.PartNo.Contains(partNo)).ToList();
+ }
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ ProductModel dm = Tool.Mapper(item);
+ var info = s_list.FirstOrDefault(p => p.ProductTypeID == item.ProductTypeID);
+ if (info != null)
+ {
+ dm.ProductTypeName = info.ProductTypeName;
+ }
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Product SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData(string productTypeNo, string productTypeNo1)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ BasicBLL productTypeDB = new BasicBLL();
+
+ if (productTypeNo1 != "")
+ {
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into
+ val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo || grp.ProductTypeNo == productTypeNo1
+ select new {m.PartNo, PartName = m.PartNo + "----" + m.ProductName};
+ jsonStr = JSONTools.ScriptSerialize(info);
+ }
+ else
+ {
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into
+ val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { m.PartNo, PartName = m.PartNo + "----" + m.ProductName };
+ jsonStr = JSONTools.ScriptSerialize(info);
+ }
+
+
+
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ public string GetComboboxProduct(string productTypeNo)
+ {
+ try
+ {
+
+ BasicBLL productTypeDB = new BasicBLL();
+
+
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { m.ProductID, m.ProductName };
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+
+
+ public string GetComboboxDataForStockNo(string productTypeNo)
+ {
+ try
+ {
+
+ BasicBLL productTypeDB = new BasicBLL();
+
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { c_id = m.StockNo, c_text = m.PartNo + "--" + m.ProductName, c_name = m.StockNo + "--" + m.ProductName, c_name2 = m.PartNo };
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ public DataTable SearchInfoByType(string type, string stationNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByType(type, stationNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoAllByType(string type)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoAllByType(type);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByName(string productName, string ProductTypeNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByName(productName, ProductTypeNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByPartNo(string partNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByPartNo(partNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchIsImportByStockNo(string stockNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchIsImportByStockNo(stockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ public DataTable SearchInfoByProductName(string ProductName)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByProductName(ProductName);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool UpdatePDF(string id, string fileName)
+ {
+ try
+ {
+ tb_Product md = new tb_Product();
+ md.ProductID = id;
+ md.PicturePath = fileName;
+
+ //初始化要更新的字段
+ string[] proNames = new string[1];
+ proNames[0] = "PicturePath";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchInfoAll()
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+
+
+ public DataTable SearchInfoByStock(string StockNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByStock(StockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs
new file mode 100644
index 0000000..c7490c6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductOfInjectionBLL
+ {
+ ProductOfInjectionDAL db=new ProductOfInjectionDAL();
+
+ public bool Add_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchCountByInfo(string station, string date, string classname, string StockNo,string partno)
+ {
+ try
+ {
+ return db.SearchCountByInfo(station,date,classname,StockNo,partno);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Update_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool UpdateBad_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.UpdteBadInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool updateProductCount(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.updateProductCount(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs
new file mode 100644
index 0000000..2896c0e
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs
@@ -0,0 +1,182 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductTypeBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ProductType md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("ProductTypeNo", md.ProductTypeNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ProductTypeID != md.ProductTypeID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ProductType md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.ProductTypeNo == md.ProductTypeNo && p.ProductTypeID != md.ProductTypeID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "ProductTypeName";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ProductType md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchInfoAll(Convert.ToInt32(page), Convert.ToInt32(pagesize), out total);//按分页查询
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///