op行程单导出程序添加

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -759,7 +759,7 @@ namespace OASystem.API.Controllers
                     var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
                     if (result.Count == 0)
                     {
-                        return Ok(JsonView(false, "暂无数据！"));
+                        return Ok(JsonView(400, "暂无数据！", new List<string>()));
                     }
                     return Ok(JsonView(true,"查询成功！",result));
                 }

OASystem/OASystem.Domain/Entities/Groups/Grp_TravelList.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+
+    /// <summary>
+    /// OP行程单数据
+    /// </summary>
+    public class Grp_TravelList: EntityBase
+    {
+
+        /// <summary>
+        ///  团组ID
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Diid { get; set; }
+
+        /// <summary>
+        ///  天数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Days { get; set; }
+
+        /// <summary>
+        ///  日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string Date { get; set; }
+
+        /// <summary>
+        ///  星期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string WeekDay { get; set; }
+
+        /// <summary>
+        ///  当日第1个交通工具
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string Traffic_First { get; set; }
+
+        /// <summary>
+        ///   当日第2个交通工具
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string Traffic_Second { get; set; }
+
+        /// <summary>
+        ///  行程       
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(MAX)")]
+        public string Trip { get; set; }
+
+        /// <summary>
+        /// 区分属于第几次保存
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Diffgroup { get; set; }
+
+        /// <summary>
+        /// 最终确定选择项
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Issel { get; set; }
+
+
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -293,7 +293,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     _CreditCardPayment.PaymentCurrencyName = _sqlSugar.Queryable<Sys_SetData>().First(a => a.Id == _CreditCardPayment.PaymentCurrency).Name;
                     if (_CreditCardPayment.OrbitalPrivateTransfer == 0) _CreditCardPayment.OrbitalPrivateTransferStr = "公转";
                     else _CreditCardPayment.OrbitalPrivateTransferStr = "私转";
-                }
+                } 
 
                 Dictionary<string, string> soureDic = new Dictionary<string, string>()
                 {
@@ -393,7 +393,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Payment = _Payment,
                         TableInitialization = _TableInitialization,
                         carTouristGuides = carTouristGuides,
-                        CreditCardPayment = _CreditCardPayment,
+                        CreditCardPayment = _CreditCardPayment ??= new CarTouristCreditCardPaymentView(),
                         ssdv,
                         checkedItemId
                     };

OASystem/OASystem.sln

@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_Doc", "_Doc\_Doc.csproj",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OASystem.RedisRepository", "OASystem.RedisRepository\OASystem.RedisRepository.csproj", "{61A68BE5-21A1-4B3B-9267-757A8BAB4E69}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpWin", "OpWin\OpWin.csproj", "{9967A29F-BBDE-459D-8515-59D766293983}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,10 @@ Global
 		{61A68BE5-21A1-4B3B-9267-757A8BAB4E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61A68BE5-21A1-4B3B-9267-757A8BAB4E69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61A68BE5-21A1-4B3B-9267-757A8BAB4E69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9967A29F-BBDE-459D-8515-59D766293983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9967A29F-BBDE-459D-8515-59D766293983}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9967A29F-BBDE-459D-8515-59D766293983}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9967A29F-BBDE-459D-8515-59D766293983}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OASystem/OpWin/Home.Designer.cs

@@ -0,0 +1,109 @@
+namespace OpWin
+{
+    partial class Home
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            btnImport = new Button();
+            btnOutput = new Button();
+            comb_Delegation = new ComboBox();
+            lblImport = new Label();
+            lblOutputResult = new Label();
+            SuspendLayout();
+            // 
+            // btnImport
+            // 
+            btnImport.Location = new Point(38, 170);
+            btnImport.Name = "btnImport";
+            btnImport.Size = new Size(75, 23);
+            btnImport.TabIndex = 0;
+            btnImport.Text = "导入数据";
+            btnImport.UseVisualStyleBackColor = true;
+            btnImport.Click += btnImport_Click;
+            // 
+            // btnOutput
+            // 
+            btnOutput.Location = new Point(418, 170);
+            btnOutput.Name = "btnOutput";
+            btnOutput.Size = new Size(75, 23);
+            btnOutput.TabIndex = 1;
+            btnOutput.Text = "导出行程单";
+            btnOutput.UseVisualStyleBackColor = true;
+            btnOutput.Click += btnOutput_Click;
+            // 
+            // comb_Delegation
+            // 
+            comb_Delegation.FormattingEnabled = true;
+            comb_Delegation.Location = new Point(38, 21);
+            comb_Delegation.Name = "comb_Delegation";
+            comb_Delegation.Size = new Size(455, 25);
+            comb_Delegation.TabIndex = 2;
+            comb_Delegation.TextUpdate += comb_Delegation_TextUpdate;
+            comb_Delegation.MouseClick += comb_Delegation_MouseClick;
+            // 
+            // lblImport
+            // 
+            lblImport.AutoSize = true;
+            lblImport.Location = new Point(38, 150);
+            lblImport.Name = "lblImport";
+            lblImport.Size = new Size(0, 17);
+            lblImport.TabIndex = 3;
+            // 
+            // lblOutputResult
+            // 
+            lblOutputResult.AutoSize = true;
+            lblOutputResult.Location = new Point(422, 150);
+            lblOutputResult.Name = "lblOutputResult";
+            lblOutputResult.Size = new Size(0, 17);
+            lblOutputResult.TabIndex = 4;
+            // 
+            // Home
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(533, 222);
+            Controls.Add(lblOutputResult);
+            Controls.Add(lblImport);
+            Controls.Add(comb_Delegation);
+            Controls.Add(btnOutput);
+            Controls.Add(btnImport);
+            Name = "Home";
+            Text = "OP行程单导出";
+            Load += Home_Load;
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button btnImport;
+        private Button btnOutput;
+        private ComboBox comb_Delegation;
+        private Label lblImport;
+        private Label lblOutputResult;
+    }
+}

OASystem/OpWin/Home.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OASystem/OpWin/OpWin.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OASystem.Api\OASystem.API.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Aspose.Words">
+      <HintPath>..\..\..\OA2021\Lib\Aspose.Words.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>

OASystem/OpWin/Program.cs

@@ -0,0 +1,17 @@
+namespace OpWin
+{
+    internal static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new Home());
+        }
+    }
+}