Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-15 cb8543b802db2aa3891e93c3ca3a1eeb5bea0663

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

 PipeLineLems.PDA/pages/pick/index.vue

@@ -29,8 +29,8 @@
        <template v-slot:footer>
            <view class="bottom-btns-row">
                <template>
                    <div class="btn-frame"><u-button  type="primary" text="组 æ‰˜" @click="onSubmit"></u-button></div>
                    <div class="btn-frame"><u-button type="primary" text="分拣入库" @click="addInBound"></u-button></div>
                    <div class="btn-frame"><u-button  type="primary" text="ç¡® è®¤ åˆ† æ‹£" @click="onSubmit"></u-button></div>
                    <!-- <div class="btn-frame"><u-button type="primary" text="分拣入库" @click="addInBound"></u-button></div> -->
                </template>
            </view>
        </template>

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs

@@ -97,12 +97,13 @@
        var firstWorkPlans = await workPlanAppService.GetListByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);

        var firstWorkPlan = await workPlanAppService.GetSingleByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
        var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("分拣原料管标识");
        var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("分拣原料管型号");
        var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("原料管标识");
        var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("原料管型号");
        var rawPipe_Batch = await materialProvider.FindByNameAsync("原料管批次");
        List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
        foreach (var item in workSection.MaterialParameters)
        {
            if (item.Name == "分拣原料管型号")
            if (item.Name == "原料管型号")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
@@ -114,7 +115,7 @@

                });
            }
            if (item.Name == "分拣原料管标识")
            if (item.Name == "原料管标识")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
@@ -126,6 +127,18 @@

                });
            }
            if (item.Name == "原料管批次")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
                    Key = item.Key,
                    Quantity = 1,
                    MaterialId = rawPipe_Batch.MaterialId,
                    MaterialDetailId = rawPipe_Batch.MaterialDetails.First().Id,
                    Value = "111",//批次暂时写死

                });
            }
        };

        //配置过程参数(采集参数、配方参数)

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs

@@ -179,7 +179,7 @@
        updateObj.ProductCode = input.ProductCode;
        updateObj.WorkstationCode = input.WorkstationCode;
        updateObj.EquipmentCode = input.EquipmentCode;
        updateObj.WorkpieceName = input.WorkpieceName;
     
        updateObj.ProcessName = input.ProcessName;
        updateObj.PipeFittingCode = input.PipeFittingCode;
        updateObj.PreSerialNumber = input.PreSerialNumber;

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs

@@ -139,10 +139,25 @@
        /// </summary>
        public string EquipmentCode { get; set; }

        ///// <summary>
        ///// å·¥ä»¶åç§°
        ///// </summary>
        //public string WorkpieceName { get; set; }

        /// <summary>
        /// å·¥ä»¶åç§°
        /// äº§çº¿ç¼–码
        /// </summary>
        public string WorkpieceName { get; set; }
        public string ProdLineCode { get; set; }

        /// <summary>
        /// èˆ¹å·
        /// </summary>
        public string ShipNumber { get; set; }

        /// <summary>
        /// é¡¹ç›®å·
        /// </summary>
        public string ProjectNumber { get; set; }

        /// <summary>
        /// å·¥åºåç§°

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs

@@ -64,7 +64,10 @@
            b.Property(x => x.ProductCode).HasMaxLength(256).HasComment("产品代码");
            b.Property(x => x.WorkstationCode).HasMaxLength(256).HasComment("工位代码");
            b.Property(x => x.EquipmentCode).HasMaxLength(256).HasComment("设备代码");
            b.Property(x => x.WorkpieceName).HasMaxLength(256).HasComment("工件名称");
            b.Property(x => x.ProdLineCode).HasMaxLength(256).HasComment("产线编码");
            b.Property(x => x.ShipNumber).HasMaxLength(256).HasComment("船号");
            b.Property(x => x.ProjectNumber).HasMaxLength(256).HasComment("项目号");

            b.Property(x => x.ProcessName).HasMaxLength(256).HasComment("工序名称");
            b.Property(x => x.PipeFittingCode).HasMaxLength(256).HasComment("管件编码");
            b.Property(x => x.PreSerialNumber).HasMaxLength(256).HasComment("顺序号");

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.Designer.cs

ÎļþÃû´Ó PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.Designer.cs ÐÞ¸Ä
@@ -12,7 +12,7 @@
namespace CMS.Plugin.PipeLineLems.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250511041027_Update1")]
    [Migration("20250515064954_Update1")]
    partial class Update1
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -288,8 +288,7 @@

                    b.HasKey("Id");

                    b.HasIndex("DataIdentifier")
                        .IsUnique();
                    b.HasIndex("DataIdentifier");

                    b.ToTable("scms_callmaterialorderrecords", (string)null);

@@ -584,10 +583,20 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("工艺流向编号");

                    b.Property<string>("ProdLineCode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("产线编码");

                    b.Property<string>("ProductCode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("产品代码");

                    b.Property<string>("ProjectNumber")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("项目号");

                    b.Property<int>("Quantity")
                        .HasColumnType("int")
@@ -597,6 +606,11 @@
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<string>("ShipNumber")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("船号");

                    b.Property<int>("Sort")
                        .ValueGeneratedOnAdd()
@@ -632,11 +646,6 @@
                    b.Property<int>("WorkPlanStatus")
                        .HasColumnType("int")
                        .HasComment("计划状态");

                    b.Property<string>("WorkpieceName")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("工件名称");

                    b.Property<string>("WorkstationCode")
                        .HasMaxLength(256)

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.cs

ÎļþÃû´Ó PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.cs ÐÞ¸Ä
@@ -176,7 +176,11 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    EquipmentCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "设备代码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    WorkpieceName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工件名称")
                    ProdLineCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "产线编码")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ShipNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "船号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProjectNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "项目号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "工序名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
@@ -240,8 +244,7 @@
            migrationBuilder.CreateIndex(
                name: "IX_scms_callmaterialorderrecords_DataIdentifier",
                table: "scms_callmaterialorderrecords",
                column: "DataIdentifier",
                unique: true);
                column: "DataIdentifier");

            migrationBuilder.CreateIndex(
                name: "IX_scms_callmaterialorders_DataIdentifier",

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs

@@ -286,8 +286,7 @@

                    b.HasKey("Id");

                    b.HasIndex("DataIdentifier")
                        .IsUnique();
                    b.HasIndex("DataIdentifier");

                    b.ToTable("scms_callmaterialorderrecords", (string)null);

@@ -582,10 +581,20 @@
                        .HasColumnType("varchar(256)")
                        .HasComment("工艺流向编号");

                    b.Property<string>("ProdLineCode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("产线编码");

                    b.Property<string>("ProductCode")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("产品代码");

                    b.Property<string>("ProjectNumber")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("项目号");

                    b.Property<int>("Quantity")
                        .HasColumnType("int")
@@ -595,6 +604,11 @@
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("备注");

                    b.Property<string>("ShipNumber")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("船号");

                    b.Property<int>("Sort")
                        .ValueGeneratedOnAdd()
@@ -630,11 +644,6 @@
                    b.Property<int>("WorkPlanStatus")
                        .HasColumnType("int")
                        .HasComment("计划状态");

                    b.Property<string>("WorkpieceName")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("工件名称");

                    b.Property<string>("WorkstationCode")
                        .HasMaxLength(256)