222
schangxiang@126.com
6 天以前 820715f221332b8b291a31fb0bd88b9fca59ddbd
222
已添加2个文件
已修改2个文件
36 ■■■■ 文件已修改
DBScript/03_DDL_TABLE_Index.sql 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_pda/pages/retrospect/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
读我.txt 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBScript/03_DDL_TABLE_Index.sql
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
-- åˆ›å»ºéžèšé›†ç´¢å¼•(推荐)  ã€Editby shaocx,2025-12-03】
CREATE NONCLUSTERED INDEX IX_WorkPieceProcess_WorkPieceID
ON [WorkPieceProcess] (WorkPieceID);
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
@@ -1,15 +1,16 @@
using 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,
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: '加工时长'},
¶ÁÎÒ.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