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

liuying

2025-09-24 16edbbe772e24eb71f6519558576d513e3cf2746

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

 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,

 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; }


 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,

 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; }


 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'

 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,

 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特有相关 */

 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:{

 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>