0630126012170da25291d55f0a1bd3130e64f434..6efa5f6ca7536a37e3af3592bb42db63bcb8371d
2025-09-24 liuying
代码备份
6efa5f 对比 | 目录
2025-09-24 liuying
Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
16edbb 对比 | 目录
2025-09-24 schangxiang@126.com
222
68941a 对比 | 目录
已添加5个文件
已修改9个文件
26 ■■■■ 文件已修改
dist最新大屏3d打包-带缓存岛20250924.7z 补丁 | 查看 | 原始文档 | blame | 历史
dist没有缓存岛的备份20250109.7z 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_iwara-scada-web/public/config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_pda/manifest.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_pda/pages/retrospect/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_pda/pages/retrospect/modules/barContent.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_screen-2d备份-20250924.rar 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_screen123.rar 补丁 | 查看 | 原始文档 | blame | 历史
yiqi_screen_3d无3d源码备份20250924.rar 补丁 | 查看 | 原始文档 | blame | 历史
dist×îдóÆÁ3d´ò°ü-´ø»º´æµº20250924.7z
Binary files differ
distûÓлº´æµºµÄ±¸·Ý20250109.7z
Binary files differ
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>
yiqi_screen-2d±¸·Ý-20250924.rar
Binary files differ
yiqi_screen123.rar
Binary files differ
yiqi_screen_3dÎÞ3dÔ´Â뱸·Ý20250924.rar
Binary files differ