排版

2026-04-02 18:22:18 +08:00
parent 37d0b928ec
commit 7998312785
11 changed files with 469 additions and 352 deletions
--- a/web/App_Code/Model/Model.cs
+++ b/web/App_Code/Model/Model.cs
@@ -184,6 +184,9 @@ namespace Model
        public string partno { get; set; }
        public string print_init { get; set; }
        public string is_reconcile { get; set; }
+        public string pageSize { get; set; }
+        public string printSize { get; set; }
+        public string defaultStyle { get; set; }
    
        public virtual actItem_kind actItem_kind { get; set; }
        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
--- a/web/App_Code/Model/Model.edmx
+++ b/web/App_Code/Model/Model.edmx
@@ -91,6 +91,9 @@
          <Property Name="customize_data" Type="nvarchar(max)" />
          <Property Name="reg_time" Type="datetime" />
          <Property Name="is_reconcile" Type="nvarchar" MaxLength="1" />
+          <Property Name="pageSize" Type="varchar" MaxLength="50" />
+          <Property Name="printSize" Type="varchar" MaxLength="50" />
+          <Property Name="defaultStyle" Type="varchar" MaxLength="50" />
        </EntityType>
        <EntityType Name="actItem_files">
          <Key>
@@ -480,7 +483,7 @@
          <Property Name="country" Type="nvarchar" MaxLength="5" />
          <Property Name="appellation_id" Type="int" />
          <Property Name="follower_hash" Type="nvarchar" MaxLength="100" />
-          <Property Name="search_keywords" Type="nvarchar(max)" />
+          <Property Name="search_keywords" Type="varchar(max)" />
        </EntityType>
        <EntityType Name="followers_tablet">
          <Key>
@@ -724,7 +727,7 @@
          <Property Name="customize_data" Type="nvarchar(max)" />
          <Property Name="printed_files" Type="nvarchar(max)" />
          <Property Name="UpdateTime" Type="datetime2" Precision="7" />
-		  <Property Name="style" Type="varchar" MaxLength="50" />
+          <Property Name="style" Type="varchar" MaxLength="50" />
        </EntityType>
        <EntityType Name="pro_order_record">
          <Key>
@@ -981,7 +984,7 @@
          <Property Name="balance_act_item" Type="int" />
          <Property Name="balance_pro_order_detail" Type="int" />
        </EntityType>
-        <Association Name="FK__Ancestral__Regis__4DF47A4E">
+        <Association Name="FK__Ancestral__Regis__1A9EF37A">
          <End Role="AncestralTabletRegistrant" Type="Self.AncestralTabletRegistrant" Multiplicity="1" />
          <End Role="AncestralTabletPositionRecord" Type="Self.AncestralTabletPositionRecord" Multiplicity="*" />
          <ReferentialConstraint>
@@ -1129,18 +1132,6 @@
            </Dependent>
          </ReferentialConstraint>
        </Association>
-        <Association Name="FK_activity_activity_kind">
-          <End Role="activity_kind" Type="Self.activity_kind" Multiplicity="0..1" />
-          <End Role="activity" Type="Self.activity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="activity_kind">
-              <PropertyRef Name="num" />
-            </Principal>
-            <Dependent Role="activity">
-              <PropertyRef Name="kind" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
        <Association Name="FK_activity_check_activity">
          <End Role="activity" Type="Self.activity" Multiplicity="0..1">
            <OnDelete Action="Cascade" />
@@ -2158,7 +2149,7 @@
          <EntitySet Name="supplier" EntityType="Self.supplier" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="supplier_kind" EntityType="Self.supplier_kind" Schema="dbo" store:Type="Tables" />
          <EntitySet Name="transfer_register" EntityType="Self.transfer_register" Schema="dbo" store:Type="Tables" />
-          <AssociationSet Name="FK__Ancestral__Regis__4DF47A4E" Association="Self.FK__Ancestral__Regis__4DF47A4E">
+          <AssociationSet Name="FK__Ancestral__Regis__1A9EF37A" Association="Self.FK__Ancestral__Regis__1A9EF37A">
            <End Role="AncestralTabletRegistrant" EntitySet="AncestralTabletRegistrant" />
            <End Role="AncestralTabletPositionRecord" EntitySet="AncestralTabletPositionRecord" />
          </AssociationSet>
@@ -2206,10 +2197,6 @@
            <End Role="activity_category_kind" EntitySet="activity_category_kind" />
            <End Role="activity" EntitySet="activity" />
          </AssociationSet>
-          <AssociationSet Name="FK_activity_activity_kind" Association="Self.FK_activity_activity_kind">
-            <End Role="activity_kind" EntitySet="activity_kind" />
-            <End Role="activity" EntitySet="activity" />
-          </AssociationSet>
          <AssociationSet Name="FK_activity_check_activity" Association="Self.FK_activity_check_activity">
            <End Role="activity" EntitySet="activity" />
            <End Role="activity_check" EntitySet="activity_check" />
@@ -2614,6 +2601,9 @@
          <Property Name="print_init" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
          <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_actItem" FromRole="actItem" ToRole="transfer_register" />
          <Property Name="is_reconcile" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
+          <Property Name="pageSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="printSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="defaultStyle" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
          </EntityType>
        <EntityType Name="actItem_files">
          <Key>
@@ -2973,7 +2963,7 @@
          <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_followers" FromRole="follower" ToRole="transfer_register" />
          <NavigationProperty Name="transfer_register1" Relationship="Model.FK_transfer_register_followers_match" FromRole="follower" ToRole="transfer_register" />
          <NavigationProperty Name="GuaDanOrder" Relationship="Model.FK_GuaDanOrder_Followers" FromRole="follower" ToRole="GuaDanOrder" />
-          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
          <NavigationProperty Name="GuaDanOrderGuest" Relationship="Model.FK_GuaDanOrderGuest_FOLLOWERS" FromRole="follower" ToRole="GuaDanOrderGuest" />
        </EntityType>
        <EntityType Name="followers_tablet">
@@ -3189,7 +3179,7 @@
          <Property Name="UpdateTime" Type="DateTime" Precision="7" />
          <NavigationProperty Name="accountings" Relationship="Model.FK_accounting_pro_order_detail" FromRole="pro_order_detail" ToRole="accounting" />
          <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_pro_order_detail" FromRole="pro_order_detail" ToRole="transfer_register" />
-          <Property Name="style" Type="String" Unicode="true" FixedLength="false" MaxLength="50" Nullable="true" />
+          <Property Name="style" Type="String" Unicode="false" FixedLength="false" MaxLength="50" Nullable="true" />
        </EntityType>
        <EntityType Name="pro_order_record">
          <Key>
@@ -5336,6 +5326,9 @@
          <EntitySetMapping Name="actItems">
            <EntityTypeMapping TypeName="Model.actItem">
              <MappingFragment StoreEntitySet="actItem">
+                <ScalarProperty Name="defaultStyle" ColumnName="defaultStyle" />
+                <ScalarProperty Name="printSize" ColumnName="printSize" />
+                <ScalarProperty Name="pageSize" ColumnName="pageSize" />
                <ScalarProperty Name="is_reconcile" ColumnName="is_reconcile" />
                <ScalarProperty Name="print_init" ColumnName="print_init" />
                <ScalarProperty Name="partno" ColumnName="partno" />
--- a/web/App_Code/Model/Model.edmx.diagram
+++ b/web/App_Code/Model/Model.edmx.diagram
@@ -17,7 +17,7 @@
        <EntityTypeShape EntityType="Model.activity_check" Width="1.5" PointX="5.25" PointY="18.5" IsExpanded="true" />
        <EntityTypeShape EntityType="Model.activity_kind" Width="1.5" PointX="0.75" PointY="11.625" IsExpanded="true" />
        <EntityTypeShape EntityType="Model.activity_kind_detail" Width="1.5" PointX="13.5" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="Model.activity_relating" Width="1.5" PointX="10.5" PointY="9.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="Model.activity_relating" Width="1.5" PointX="11.25" PointY="9.875" IsExpanded="true" />
        <EntityTypeShape EntityType="Model.activity_spares" Width="1.5" PointX="13.5" PointY="7.75" IsExpanded="true" />
        <EntityTypeShape EntityType="Model.admin" Width="1.5" PointX="6" PointY="1.375" IsExpanded="true" />
        <EntityTypeShape EntityType="Model.admin_group" Width="1.5" PointX="3.75" PointY="3.625" IsExpanded="true" />
--- a/web/App_Code/api/designerController.cs
+++ b/web/App_Code/api/designerController.cs
@@ -1,5 +1,6 @@
 using Microsoft.Ajax.Utilities;
 using MINOM.COM.Utility;
+using Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -14,6 +15,7 @@ using System.Web.Http;
 /// </summary>
 public class designerController : ApiController
 {
+    private Model.ezEntities _db = new Model.ezEntities();
    public designerController()
    {
        //
@@ -21,6 +23,19 @@ public class designerController : ApiController
        //
    }

+
+    [HttpPost]
+    [Route("api/tablet/GetActItem")]
+    public IHttpActionResult GetActItem([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        string itemNum = (json == null || json.itemNum == null) ? "" : (string)json.itemNum;
+        int num = int.Parse(itemNum);
+        var item=_db.actItems.AsQueryable().Where(x => x.num == num).FirstOrDefault();
+        return Ok(new { result = "Y", data =item});
+    }
+
    [HttpPost]
    [Route("api/tablet/GetTabletElement")]
    public IHttpActionResult GetTabletElement([FromBody] dynamic data)
@@ -131,6 +146,14 @@ public class designerController : ApiController
        if (mode == "add")
        {
            object[] obj = new StyleDataAccess().AddStyle(ts, list);
+            if (obj[0].ToString() == "Y")
+            {
+                return Ok(new { result = "Y" });
+            }
+            else
+            {
+                return Ok(new { result = "N" });
+            }
        }
        return Ok();
    }
@@ -188,8 +211,14 @@ public class designerController : ApiController
        }

        object[] obj = new StyleDataAccess().UpdateStyle(ts, list);
-
-        return Ok();
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y" });
+        }
+        else
+        {
+            return Ok(new { result = "N" });
+        }
    }


@@ -238,8 +267,14 @@ public class designerController : ApiController
        tps.UTime = DateTime.Now.ToString("HHmmss");

        object[] obj = new StyleDataAccess().AddTabletPaper(tps);
-
-        return Ok();
+        if (obj[0].ToString()=="Y")
+        {
+            return Ok(new { result = "Y" });
+        }
+        else
+        {
+            return Ok(new { result = "N"});
+        }
    }

 }