From cb8543b802db2aa3891e93c3ca3a1eeb5bea0663 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 14:59:53 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 21 ++++++++--
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs | 5 ++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs | 19 ++++++++-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.cs | 9 +++-
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.Designer.cs | 25 ++++++++----
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 23 ++++++++---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 2
PipeLineLems.PDA/pages/pick/index.vue | 4 +-
8 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/PipeLineLems.PDA/pages/pick/index.vue b/PipeLineLems.PDA/pages/pick/index.vue
index 94f90d9..176918c 100644
--- a/PipeLineLems.PDA/pages/pick/index.vue
+++ b/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>
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index 9e1d4b1..8183c36 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/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",//鎵规鏆傛椂鍐欐
+
+ });
+ }
};
//閰嶇疆杩囩▼鍙傛暟(閲囬泦鍙傛暟銆侀厤鏂瑰弬鏁�)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index af37ddd..1372c83 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/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;
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
index 6c4c61d..6a12be7 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
+++ b/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>
/// 宸ュ簭鍚嶇О
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
index ecce079..acac07c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
+++ b/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("椤哄簭鍙�");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.Designer.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.Designer.cs
similarity index 97%
rename from PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.Designer.cs
rename to PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.Designer.cs
index 78e4266..688e61d 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.Designer.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_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)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.cs
similarity index 97%
rename from PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.cs
rename to PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_Update1.cs
index 34e010d..2c578b0 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511041027_Update1.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250515064954_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",
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index 4c19fa8..5f49a49 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/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)
--
Gitblit v1.9.3