From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
yiqi_pda/manifest.json | 2 +-
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 1 +
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 2 ++
yiqi_iwara-scada-web/public/config.js | 4 ++--
yiqi_pda/pages/retrospect/index.vue | 3 ++-
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs | 3 +++
yiqi_pda/pages/retrospect/modules/barContent.vue | 1 -
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs | 4 ++++
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 6 ++++++
9 files changed, 21 insertions(+), 5 deletions(-)
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 f5a2fc7..f56d5f8 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
@@ -240,6 +240,8 @@
{
Id = s.a.Id,
+ JiaJuGongWei = s.a.JiaJuGongWei,
+
DataCapturePointCname = s.a.DataCapturePointCname,
UpdateDataCapturePointCname = s.a.UpdateDataCapturePointCname,
QualityNoOkReason = s.a.QualityNoOkReason,
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
index e12ddf4..ec82c6b 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
@@ -27,6 +27,9 @@
/// </summary>
public class WorkPieceProcessOutput
{
+
+ [StringLength(50)]
+ public string JiaJuGongWei { get; set; }
[StringLength(50)]
public string DataCapturePointCname { get; set; }
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index edf7a6d..23a863c 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -104,6 +104,7 @@
select new WorkPieceProcessOutput
{
+ JiaJuGongWei = process.JiaJuGongWei,
UpdatedUserName = process.UpdatedUserName,
DataCapturePointCname = process.DataCapturePointCname,
UpdateDataCapturePointCname = process.UpdateDataCapturePointCname,
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
index 499f638..cfde7ae 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
@@ -21,6 +21,10 @@
[Comment("宸ヤ欢鍔犲伐灞ュ巻琛�")]
public class WorkPieceProcess : DEntityBase
{
+
+ [StringLength(50)]
+ public string JiaJuGongWei { get; set; }
+
[StringLength(50)]
public string DataCapturePointCname { get; set; }
diff --git a/yiqi_iwara-scada-web/public/config.js b/yiqi_iwara-scada-web/public/config.js
index f6ddba0..b072eea 100644
--- a/yiqi_iwara-scada-web/public/config.js
+++ b/yiqi_iwara-scada-web/public/config.js
@@ -1,2 +1,2 @@
-//window.VUE_BASE_URL = 'http://localhost:7788'
-window.VUE_BASE_URL = 'http://192.168.216.203:7788'
+window.VUE_BASE_URL = 'http://localhost:7788'
+//window.VUE_BASE_URL = 'http://192.168.216.203:7788'
diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
index 90f7852..22bb665 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
@@ -339,6 +339,12 @@
dataIndex: 'timeSceonds'
},
{
+ title: '澶瑰叿宸ヤ綅',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'jiaJuGongWei'
+ },
+ {
title: '鏉ユ簮',
align: 'center',
sorter: true,
diff --git a/yiqi_pda/manifest.json b/yiqi_pda/manifest.json
index 4946b0f..85884fc 100644
--- a/yiqi_pda/manifest.json
+++ b/yiqi_pda/manifest.json
@@ -2,7 +2,7 @@
"name" : "杩炴潌绾挎暟閲�",
"appid" : "__UNI__F24DEB0",
"description" : "涓�姹借繛鏉�",
- "versionName" : "2.0.21",
+ "versionName" : "2.0.22",
"versionCode" : 6,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/yiqi_pda/pages/retrospect/index.vue b/yiqi_pda/pages/retrospect/index.vue
index aa61317..c5e656c 100644
--- a/yiqi_pda/pages/retrospect/index.vue
+++ b/yiqi_pda/pages/retrospect/index.vue
@@ -61,7 +61,8 @@
{code: "timeSceonds",title: '鍔犲伐鏃堕暱'},
{code: 'qualityStateName',title: '璐ㄩ噺鐘舵��'},
{code: 'dataCapturePointCname',title: '鏉ユ簮'},
- {code: 'createUserName',title: '鏉ユ簮浠ｇ爜'}
+ {code: 'createUserName',title: '鏉ユ簮浠ｇ爜'},
+ {code: 'jiaJuGongWei',title: '澶瑰叿宸ヤ綅'}
]
},
methods:{
diff --git a/yiqi_pda/pages/retrospect/modules/barContent.vue b/yiqi_pda/pages/retrospect/modules/barContent.vue
index df568e1..c81d8b1 100644
--- a/yiqi_pda/pages/retrospect/modules/barContent.vue
+++ b/yiqi_pda/pages/retrospect/modules/barContent.vue
@@ -6,7 +6,6 @@
<view v-for="item in propArr" :key="item.code" class="item">
<view class="item_title">{{item.title}}</view>
<view class="item_content">{{content[item.code]}}</view>
-
</view>
</view>
</view>
--
Gitblit v1.9.3