feat:增加焊前管理，材料管理条码扫码接口，材料信息导入支持无炉批号/有炉批号 多种导入方式

SGGL/Model/APIItem/HJGL/PreWeldInspectionItem.cs

@@ -0,0 +1,110 @@
+using System;
+
+namespace Model
+{
+    /// <summary>
+    /// 焊前抽检焊口信息
+    /// </summary>
+    public class PreWeldJointItem
+    {
+        public string WeldJointId { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public string PipelineId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string GrooveTypeId { get; set; }
+
+        public string GrooveTypeCode { get; set; }
+
+        public string GrooveTypeName { get; set; }
+
+        public string GrooveProcessType { get; set; }
+
+        public decimal? GrooveAngle { get; set; }
+
+        public decimal? FitupGap { get; set; }
+
+        public decimal? Misalignment { get; set; }
+    }
+
+    /// <summary>
+    /// 下料抽检保存参数
+    /// </summary>
+    public class PreWeldCuttingCheckItem
+    {
+        public string CuttingCheckId { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string WeldJointId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public bool IsMaterialCodeBatchNoAccurate { get; set; }
+
+        public bool IsMaterialQuantityAccurate { get; set; }
+
+        public bool IsQualified { get; set; }
+
+        public string CheckPerson { get; set; }
+
+        public string CheckPersonName { get; set; }
+
+        public DateTime? CheckTime { get; set; }
+
+        public string CreateUser { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string Remark { get; set; }
+    }
+
+    /// <summary>
+    /// 组对抽检保存参数
+    /// </summary>
+    public class PreWeldFitupCheckItem
+    {
+        public string FitupCheckId { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string WeldJointId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public string GrooveTypeId { get; set; }
+
+        public string GrooveTypeCode { get; set; }
+
+        public string GrooveTypeName { get; set; }
+
+        public string GrooveProcessType { get; set; }
+
+        public decimal? GrooveAngle { get; set; }
+
+        public decimal? FitupGap { get; set; }
+
+        public decimal? Misalignment { get; set; }
+
+        public string CheckPerson { get; set; }
+
+        public string CheckPersonName { get; set; }
+
+        public DateTime? CheckTime { get; set; }
+
+        public string CreateUser { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string Remark { get; set; }
+    }
+}

SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs

@@ -12,6 +12,8 @@ namespace Model
         public string BatchNo { get; set; }
         public string MaterialName { get; set; }
         public string MaterialDef { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
         public string BarCode { get; set; }
     }
 }

SGGL/Model/HJGL/MaterialCodeLibBarCodeOutput.cs

@@ -0,0 +1,14 @@
+namespace Model
+{
+    public class MaterialCodeLibBarCodeOutput
+    {
+        public string MaterialCode { get; set; }
+        public string Code { get; set; }
+        public string HeatNo { get; set; }
+        public string BatchNo { get; set; }
+        public string MaterialName { get; set; }
+        public string MaterialDef { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -126,6 +126,7 @@
     <Compile Include="APIItem\HSSE\HazardListSelectedItem.cs" />
     <Compile Include="APIItem\HSSE\HazardRegisterItem.cs" />
     <Compile Include="APIItem\HJGL\HJGL_PreWeldingDailyItem.cs" />
+    <Compile Include="APIItem\HJGL\PreWeldInspectionItem.cs" />
     <Compile Include="APIItem\HJGL\HotProcessHardItem.cs" />
     <Compile Include="APIItem\HJGL\NDETrustItem.cs" />
     <Compile Include="APIItem\HJGL\WeldJointItem.cs" />
@@ -251,6 +252,7 @@
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\BaseInfo\BaseMaterialcolorDataIn.cs" />
     <Compile Include="HJGL\BaseInfo\BaseMaterialcolorOutput.cs" />
+    <Compile Include="HJGL\MaterialCodeLibBarCodeOutput.cs" />
     <Compile Include="HJGL\PreDesign\Material\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
     <Compile Include="HJGL\PreDesign\PackagingManage\PackagingManageInput.cs" />