能够实现多人扫码出库，材料匹配生成的任务单，排序需要一致，退货入库导入，匹配管线正在出库中管线不统计散件出库

SGGL/BLL/API/HJGL/APIPackagingManageService.cs

@@ -110,9 +110,28 @@ namespace BLL
             {
                 var table = db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == packagingManageId);
                 if (table != null)
+                {
+                    if (string.IsNullOrEmpty(table.PipelineComponentId))
                     {
                         table.PipelineComponentId = PipelineComponentIds;
                     }
+                    else
+                    {
+                        HashSet<string> set = new HashSet<string>();
+                        string[] oldIds = table.PipelineComponentId.Split(',');
+                        foreach (var id in oldIds)
+                        {
+                            set.Add(id);
+                        }
+                        string[] newIds = PipelineComponentIds.Split(',');
+                        foreach (var id in newIds)
+                        {
+                            set.Add(id);
+                        }
+                        table.PipelineComponentId = string.Join(",", set);
+
+                    }
+                }
                 BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table);
 
             } 

SGGL/BLL/CLGL/TwArrivalStatisticsService.cs

@@ -178,6 +178,7 @@ namespace BLL
                                          join master in db.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id
                                          join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                          join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId      
+                                         join t in db.HJGL_WeldTask on  master.WeldTaskId equals t.WeldTaskId
                                          where x.InOutPlanMasterId == outPlanMasterId
                                          select new Tw_PipeMatMatchOutput
                                          {
@@ -191,6 +192,7 @@ namespace BLL
                                              MaterialUnit = y.MaterialUnit,
                                              MaterialDef = y.MaterialDef,
                                              NeedNum = x.Number, 
+                                             PipeLineSortIndex=t.PipeLineSortIndex
                                          }
                     ).ToList();
                 var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);                   

SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 
@@ -82,9 +83,10 @@ namespace BLL
 
         public static Model.Tw_InOutPlanDetail_Relation GetByPipelineId(string pipelineId,string WarehouseCode)
         {
+            int typeInt = (int)TwConst.TypeInt.散件出库;
             var q= from x in  Funs.DB.Tw_InOutPlanDetail_Relation
                    join y in Funs.DB .Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
-                   where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode
+                   where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode && y.TypeInt!= typeInt
                    select x;
             return q.FirstOrDefault(); 
         }

SGGL/BLL/CLGL/TwInOutplanmasterService.cs

@@ -87,7 +87,9 @@ namespace BLL
                         AuditDate2 = x.AuditDate2,
                         WarehouseMan = x.WarehouseMan,
                         WarehouseDate = x.WarehouseDate,
-                        WarehouseManName= warehouseperson.PersonName
+                        WarehouseManName= warehouseperson.PersonName,
+                        PipeLineSortIndex=y.PipeLineSortIndex
+
                     }
                   ;
 
@@ -145,7 +147,8 @@ namespace BLL
                        AuditDate2 = x.AuditDate2,
                        WarehouseMan = x.WarehouseMan,
                        WarehouseDate = x.WarehouseDate, 
-                       WarehouseManName= x.WarehouseManName
+                       WarehouseManName= x.WarehouseManName,
+                       PipeLineSortIndex = x.PipeLineSortIndex,
                    }).ToList();
         }
 
@@ -281,6 +284,15 @@ namespace BLL
                     return responeData;
                 }
             }
+            var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的材料编码
+            if (typeString.Contains("采购入库") && typeString.Contains("退料入库"))
+            {
+                responeData.code = 0;
+                responeData.message = errorWarehouseCode + "每次只能导入一种类型！";
+                return responeData;
+            }
+
+
             var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码
             var IsExitMaterialCode=   
                 from x in Funs.DB.HJGL_MaterialCodeLib 
@@ -296,7 +308,7 @@ namespace BLL
                     return responeData;
                 }
             }
-            string cusbilcode = GetDataInCusBillCode(projectid,UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId));
+            string cusbilcode = GetDataInCusBillCode(projectid,UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId), temeplateDtoIns.FirstOrDefault().TypeString);
             foreach (var item in temeplateDtoIns)
             {
                 item.CusBillCode = cusbilcode;
@@ -320,7 +332,7 @@ namespace BLL
             foreach (var CusBillCode in CusBillCodeList)
             {
                 var CusBillCodeDtoIns = temeplateDtoIns.Where(x => x.CusBillCode == CusBillCode).ToList();
-
+                var FirstCusBillCodeDtoIns = temeplateDtoIns.FirstOrDefault(x => x.CusBillCode == CusBillCode);
                 var mapper =
                     ObjectMapperManager.DefaultInstance.GetMapper<List<Tw_InputDataIn>, List<Model.Tw_InOutPlanMaster>>();
                 var mapperDetail =
@@ -332,7 +344,21 @@ namespace BLL
                 twInOutPlanMaster.Id = SQLHelper.GetNewID();
                 twInOutPlanMaster.InOutType= (int)TwConst.InOutType.入库;
                 twInOutPlanMaster.State = (int)TwConst.State.待审核;
-                twInOutPlanMaster.TypeInt= (int)TwConst.TypeInt.采购入库;
+
+                if ("采购入库".Equals(FirstCusBillCodeDtoIns.TypeString))
+                {
+                    twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.采购入库;
+
+                }
+                else if ("退料入库".Equals(FirstCusBillCodeDtoIns.TypeString))
+                {
+                    twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.退料入库;
+                }
+                else
+                {
+                    twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.其他入库;
+                }
+
                 twInOutPlanMaster.Category= (int)TwConst.Category.全部;
                 twInOutPlanMaster.ProjectId = projectid;
                 twInOutPlanMaster.CreateMan = creatUserId;
@@ -514,7 +540,11 @@ namespace BLL
                     planMasterModel.InOutType= (int)TwConst.InOutType.出库;
                     break;
                 case TwConst.TypeInt.退料入库:
-                    planMasterModel.CusBillCode = GetCusBillCodeByTaskCode(outMaster.WeldTaskCode, TwConst.TypeInt.退料入库, (BLL.TwConst.Category)planMasterModel.Category);
+                    string pre = "";
+                    pre += DateTime.Now.ToString("yyyyMMdd");
+                    pre += UnitService.GetUnitCodeByUnitId(outMaster.ReqUnitId);
+                    pre += "-"+ UnitWorkService.getUnitWorkByUnitWorkId(outMaster.UnitWorkId)?.UnitWorkCode;
+                    planMasterModel.CusBillCode = GetCusBillCodeByTaskCode(pre , TwConst.TypeInt.退料入库, (BLL.TwConst.Category)planMasterModel.Category);
                     planMasterModel.TypeInt = (int)TwConst.TypeInt.退料入库;
                     planMasterModel.InOutType = (int)TwConst.InOutType.入库;
                         ;
@@ -556,11 +586,11 @@ namespace BLL
                 case TwConst.TypeInt.退料入库:
                     if (category == TwConst.Category.管段)
                     {
-                        cusBillCode = taskCode + "-GI-P01-RE01";
+                        cusBillCode = taskCode + "-GI-P01-RE01-GR01";
                     }
                     else if (category == TwConst.Category.管件)
                     {
-                        cusBillCode = taskCode + "-GI-PF01-RE01";
+                        cusBillCode = taskCode + "-GI-PF01-RE01-GR01";
                     }
 
                     break;
@@ -569,20 +599,34 @@ namespace BLL
         }
 
 
-        public static string GetDataInCusBillCode(string projectid, string unitcode)
+        public static string GetDataInCusBillCode(string projectid, string unitcode,string typeString)
+        {
+            if (typeString == TwConst.TypeInt.退料入库.ToString())
             {
-
                 //生成规则是20240919-unitcode-AP-GR01
-            string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-"+unitcode + "-AP-GR";
+                string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR";
                 var queryAll = new Tw_InOutMasterOutput()
                 {
                     ProjectId = projectid,
-                CusBillCode=cusBillCode,
+                    CusBillCode = cusBillCode,
                 };
                 var queryAllresult = GetModle(queryAll).Count();
                 cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0');
                 return cusBillCode;
-
+            }
+            else
+            {
+                //生成规则是20240919-unitcode-AP-GR01
+                string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR";
+                var queryAll = new Tw_InOutMasterOutput()
+                {
+                    ProjectId = projectid,
+                    CusBillCode = cusBillCode,
+                };
+                var queryAllresult = GetModle(queryAll).Count();
+                cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0');
+                return cusBillCode;
+            }
         }
 
         /// <summary>

SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx

@@ -101,7 +101,7 @@
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单" IsFluid="true"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id"
                                     EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
-                                    AllowSorting="true" SortField="CusBillCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
+                                    AllowSorting="true" SortField="PipeLineSortIndex" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
                                     EnableTextSelection="True" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" EnableRowGroup="true" DataRowGroupField="WeldTaskCode">
                                     <Columns>
                                         <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
@@ -200,7 +200,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid3" ShowBorder="False" ShowHeader="False" Title="管线材料明细" EnableCollapse="true" ForceFit="true"
                                                     runat="server" BoxFlex="1" DataKeyNames="Id"
-                                                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode" ExpandAllRowGroups="false"
+                                                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PipeLineSortIndex,MaterialCode" ExpandAllRowGroups="false"
                                                     SortDirection="DESC" EnableRowGroup="true" DataRowGroupField="PipelineCode" AllowPaging="true" IsDatabasePaging="true" PageSize="10000" RowGroupRendererFunction="onGrid3RowGroupRenderer">
                                                     <Columns>
                                                         <f:RenderField Width="100px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"

SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs

@@ -85,7 +85,7 @@ namespace FineUIPro.Web.CLGL
                     txtCreateMan.Text = this.CurrUser.PersonName;
                     txtCreateDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
                     drpReqUnit.SelectedValue = this.CurrUser.UnitId;
-                    txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(this.CurrUser.UnitId)?.UnitCode);
+                    txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(this.CurrUser.UnitId)?.UnitCode, drpTypeInt.SelectedText);
                 }
 
                 drpTypeInt_SelectedIndexChanged(null, null);

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs

@@ -392,12 +392,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             Grid3.DataBind();
             for (int i = 0; i < Grid3.Rows.Count; i++)
             {
-                var model = Grid3.Rows[i].DataItem  ;
+                var model = Grid3.Rows[i].DataItem;
-               var model2=  JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(model));
+                var model2 = JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(model));
-               string pipeid= model2.First().Value;
+                string pipeid = model2.First().Value;
 
-                var relationModle=TwInoutplandetailRelationService.GetByPipelineId(pipeid,WarehouseCode);
+                var relationModle = TwInoutplandetailRelationService.GetByPipelineId(pipeid, WarehouseCode);
-                if (relationModle!= null)
+                if (relationModle != null)
                 {
                     Grid3.Rows[i].RowCssClass = "yellow";
                 }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx

@@ -61,7 +61,7 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接任务单" ForceFit="true"
                             EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true"
                             AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true"
-                            SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
+                            SortField="PipeLineSortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
                             AllowPaging="false" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True"
                             EnableCheckBoxSelect="true" KeepCurrentSelection="true">
                             <Toolbars>
@@ -141,7 +141,10 @@
                                     DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
                                     Width="70px">
                                 </f:RenderField>
-                
+                                <f:RenderField HeaderText="排序" ColumnID="PipeLineSortIndex" Hidden="true"
+                                    DataField="PipeLineSortIndex" SortField="PipeLineSortIndex" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
+                                    Width="70px">
+                                </f:RenderField>
                                 <f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
                                     DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="70px">

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs

@@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          where x.UnitWorkId == node.NodeID
                               && x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
                               && x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
-                         select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber }).Distinct().ToList().OrderByDescending(x => x.Date);
+                         select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber, x.PipeLineSortIndex }).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
                 if (p.Count() > 0)
                 {
                     foreach (var item in p)
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
                          where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
                          orderby x.TaskDate descending
-                         select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber }).Distinct().ToList().OrderByDescending(x => x.Date);
+                         select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber ,x.PipeLineSortIndex}).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
                 if (p.Count() > 0)
                 {
                     foreach (var item in p)
@@ -894,6 +894,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     NewItem.Dia = values.Value<int>("Dia");
                 }
+                if (!string.IsNullOrEmpty(values.Value<string>("PipeLineSortIndex")) && !string.IsNullOrEmpty(values.Value<int>("PipeLineSortIndex").ToString()))
+                {
+                    NewItem.PipeLineSortIndex = values.Value<int>("PipeLineSortIndex");
+                }
                 if (!string.IsNullOrEmpty(values.Value<int>("Thickness").ToString()))
                 {
                     NewItem.Thickness = values.Value<int>("Thickness");
@@ -902,6 +906,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     NewItem.WeldingMethodCode = values.Value<string>("WeldingMethodCode").ToString();
                 }
+
                 getNewWeldTaskItem.Add(NewItem);
 
             }

SGGL/Model/CLGL/Tw_InOutMasterOutput.cs

@@ -19,5 +19,7 @@ namespace Model
         public string ReqUnitName { get; set; }   
         public string UnitWorkId { get; set; } 
         public string WeldTaskCode { get; set; } 
+
+        public int? PipeLineSortIndex { get; set; }
     }
 }

SGGL/Model/CLGL/Tw_InputDataIn.cs

@@ -20,5 +20,10 @@ namespace Model
         /// 数量
         /// </summary>
         [ExcelColumnIndex("C")] public string PlanNum { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [ExcelColumnIndex("D")] public string TypeString { get; set; }
+
     }
 }

SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs

@@ -25,6 +25,8 @@ namespace Model
         public decimal? MatchNum { get; set; }
         public decimal? MatchRate { get; set; }
         public string MatchRateString { get; set; }
+        public int? PipeLineSortIndex { get; set; }
+
     }
     public class Tw_PipeMatchOutput
     {