From 820715f221332b8b291a31fb0bd88b9fca59ddbd Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 12月 2025 10:19:08 +0800
Subject: [PATCH] 222
---
DBScript/03_DDL_TABLE_Index.sql | 3 +++
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 23 ++++++++++++++++-------
yiqi_pda/pages/retrospect/index.vue | 1 +
读我.txt | 9 +++++++++
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/DBScript/03_DDL_TABLE_Index.sql b/DBScript/03_DDL_TABLE_Index.sql
new file mode 100644
index 0000000..c5629b7
--- /dev/null
+++ b/DBScript/03_DDL_TABLE_Index.sql
@@ -0,0 +1,3 @@
+-- 鍒涘缓闈炶仛闆嗙储寮曪紙鎺ㄨ崘锛� 銆怑ditby shaocx,2025-12-03銆�
+CREATE NONCLUSTERED INDEX IX_WorkPieceProcess_WorkPieceID
+ON [WorkPieceProcess] (WorkPieceID);
\ No newline at end of file
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
index 8203f06..4c79719 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
@@ -1,15 +1,16 @@
锘縰sing Furion.DatabaseAccessor;
-using Furion.FriendlyException;
-using iWare.Wms.Core.Util;
-using iWare.Wms.Core;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
-using System.Text;
+using Furion.FriendlyException;
+using iWare.Wms.Core;
using iWare.Wms.Core.Enum;
+using iWare.Wms.Core.Util;
+using Mapster;
using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Internal;
+using System.Text;
namespace iWare.Wms.Application.Service.Pda
{
@@ -246,6 +247,12 @@
{
var workPieceProcesss = await _workPieceProcessRep.DetachedEntities
.Join(_equipmentBaseInfoRep.DetachedEntities, a => a.EquipmentID, b => b.EquipmentId, (a, b) => new { a, b })
+ // 鏂板 Left Join 鍒� _workPieceInfo 琛�
+ .Join(_workPieceInfoRep.DetachedEntities,
+ temp => temp.a.WorkPieceID, // 浣跨敤涔嬪墠 Join 缁撴灉鐨� a.WorkPieceID
+ c => c.WorkPieceID, // _workPieceInfo 琛ㄧ殑 WorkPieceID
+ (temp, c) => new { temp.a, temp.b, workPieceInfo = c }) // 鍒涘缓鏂扮殑鍖垮悕绫诲瀷鍖呭惈涓変釜瀹炰綋
+
.Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.a.WorkPieceID.Equals(input.WorkPieceID))
.Where(o => !string.IsNullOrEmpty(o.a.WorkPieceID))
.Select(s => new WorkPieceProcessOutput
@@ -261,6 +268,8 @@
UpdatedUserName = s.a.UpdatedUserName,
WorkPieceID = s.a.WorkPieceID,
+ OP80NewCode = s.workPieceInfo.OP80NewCode,//鎴愬搧鐮�
+
WorkingProcedureCurrent = s.a.WorkingProcedureCurrent,
EquipmentID = s.a.EquipmentID,
EquipmentName = s.b.EquipmentName,
diff --git a/yiqi_pda/pages/retrospect/index.vue b/yiqi_pda/pages/retrospect/index.vue
index c5e656c..68ec52c 100644
--- a/yiqi_pda/pages/retrospect/index.vue
+++ b/yiqi_pda/pages/retrospect/index.vue
@@ -56,6 +56,7 @@
// this.statusArr = [{code: 1,title: '涓嶅悎鏍�'},{code: 2,title: '鍚堟牸'},{code: 3,title: '鐤戜技'}]
this.detailArr = [
{code: "operationType",title: '鎿嶄綔绫诲瀷'},
+ {code: "oP80NewCode",title: '鎴愬搧鐮�'},
{code: "startTime",title: '宸ュ簭涓婄嚎鏃堕棿'},
{code: "endTime",title: '宸ュ簭涓嬬嚎鏃堕棿'},
{code: "timeSceonds",title: '鍔犲伐鏃堕暱'},
diff --git "a/\350\257\273\346\210\221.txt" "b/\350\257\273\346\210\221.txt"
new file mode 100644
index 0000000..a59f59d
--- /dev/null
+++ "b/\350\257\273\346\210\221.txt"
@@ -0,0 +1,9 @@
+1銆� select * from sys_user
+
+ -- e10adc3949ba59abbe56e057f20f883e 瀵嗙爜鏄� 123456
+
+ -- update sys_user set password='e10adc3949ba59abbe56e057f20f883e' where account='superAdmin'
+
+
+2銆佸墠绔�
+ node鐗堟湰 16.20.2
\ No newline at end of file
--
Gitblit v1.9.3