xusc
|
c6ac826147
|
产品bom修改
|
1 year ago |
liky
|
abad6f0766
|
添加对应字段的枚举
|
1 year ago |
 lacy
|
8728a39f79
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
xusc
|
f54dbe2c75
|
合并冲突
|
1 year ago |
|
xusc
|
85d6053004
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
xusc
|
25725702dc
|
产品bom二级表格
|
1 year ago |
|
liky
|
b5d0f534a0
|
进一步完善
|
1 year ago |
|
liky
|
df8c55c14f
|
料品档案表
|
1 year ago |
|
liky
|
8c4f0cb599
|
解决了途程在页面缺少字段的问题，完善了途程和工序的关系
|
1 year ago |
|
liky
|
96c3481f46
|
创建途程和工序的关系表的索引
|
1 year ago |
|
liky
|
9a174e3bfe
|
途程和工序的关系
|
1 year ago |
|
liky
|
521bbc2f1a
|
为之前的表添加对应的索引
|
1 year ago |
|
lacy
|
f428f13662
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
lacy
|
425dc6046b
|
代码
|
1 year ago |
|
liky
|
3132232984
|
进一步更新相关前端以及服务器代码
|
1 year ago |
|
liky
|
2006cf1bb7
|
..
|
1 year ago |
|
xusc
|
657a600ebe
|
标准工时修改
|
1 year ago |
|
xusc
|
933e5d992c
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
liky
|
f9a7e1b91e
|
更新途程和物料主分类部分
|
1 year ago |
|
xusc
|
18007d0c52
|
合并冲突
|
1 year ago |
|
xusc
|
be419d5eb9
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
xusc
|
7d2167a463
|
修改前端控件
|
1 year ago |
|
liky
|
061ceef10b
|
更新工序所有信息的获取
|
1 year ago |
|
xusc
|
fb7426a680
|
删除框架生成器文件
|
1 year ago |
|
lacy
|
da13251b49
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
lacy
|
ca15976aa6
|
dd
|
1 year ago |
|
xusc
|
70361df25d
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
|
1 year ago |
|
xusc
|
dc6a254b0e
|
修改工单等
|
1 year ago |
|
lacy
|
85bb042389
|
打开tp
|
1 year ago |
|
lacy
|
6522e98e54
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
|
liky
|
8d7a73f6c4
|
修改多语言，进一步完善
|
1 year ago |
|
lacy
|
dc3fd3d7d5
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Service/IcsShiftType/IcsShiftTypeAppService.cs
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
|
lacy
|
7bfaa343b2
|
时段维护
|
1 year ago |
|
xusc
|
1c9a544567
|
文件修改
|
1 year ago |
|
xusc
|
31e328402e
|
xx
|
1 year ago |
|
xusc
|
12efe1ba72
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Service/基础设置/ImportExportExtAppService.cs
|
1 year ago |
|
xusc
|
2e75b2df41
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Service/基础设置/IImportExportExtAppService.cs
# src/aspnet-core/ICS.Application/Business/Service/基础设置/ImportExportExtAppService.cs
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/Migrations/20230512081736_init5.Designer.cs
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
|
1 year ago |
|
1411186949@qq.com
|
e9435c69d8
|
修改问题部分
|
1 year ago |
|
1411186949@qq.com
|
d20438bf4e
|
提交
|
1 year ago |
|
1411186949@qq.com
|
85195becc5
|
工序以及前两项的完善
|
1 year ago |
|
xusc
|
c215da5e5b
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Dtos/IcsOP/CreateOrUpdateIcsOPInput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsOP/GetIcsOPForEditOutput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsOP/GetIcsOPsInput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsSBom/CreateOrUpdateIcsSBomInput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsSBom/GetIcsSBomForEditOutput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsSBom/GetIcsSBomsInput.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsStandardWhours/IcsStandardWhoursEditDto.cs
# src/aspnet-core/ICS.Application/Business/Dtos/IcsStandardWhours/IcsStandardWhoursListDto.cs
# src/aspnet-core/ICS.Application/Business/Mapper/IcsOP/IcsOPDtoAutoMapper.cs
# src/aspnet-core/ICS.Application/Business/Mapper/IcsSBom/IcsSBomDtoAutoMapper.cs
# src/aspnet-core/ICS.Application/Business/Service/IcsOP/IIcsOPAppService.cs
# src/aspnet-core/ICS.Application/Business/Service/IcsSBom/IIcsSBomAppService.cs
# src/aspnet-core/ICS.Application/Business/Service/基础设置/ImportExportExtAppService.cs
# src/aspnet-core/ICS.Application/IcsApplicationModule.cs
# src/aspnet-core/ICS.Core/Business/Authorization/IcsOP/IcsOPAuthorizationProvider.cs
# src/aspnet-core/ICS.Core/Business/Authorization/IcsSBom/IcsSBomAuthorizationProvider.cs
# src/aspnet-core/ICS.Core/Business/DomainService/IcsOP/IIcsOPManager.cs
# src/aspnet-core/ICS.Core/Business/DomainService/IcsOP/IcsOPManager.cs
# src/aspnet-core/ICS.Core/Business/DomainService/IcsSBom/IIcsSBomManager.cs
# src/aspnet-core/ICS.Core/Business/DomainService/IcsSBom/IcsSBomManager.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsRoute/CreateOrUpdateIcsRouteInput.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsRoute/GetIcsRouteForEditOutput.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsRoute/GetIcsRoutesInput.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Mapper/IcsRoute/IcsRouteDtoAutoMapper.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Service/IcsRoute/IIcsRouteAppService.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/Authorization/IcsRoute/IcsRouteAuthorizationProvider.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/DomainService/IcsRoute/IIcsRouteManager.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/DomainService/IcsRoute/IcsRouteManager.cs
# src/aspnet-core/src/YoyoBoot.Core/Localization/SourceFiles/YoyoBoot-zh-Hans.json
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/EntityFrameworkCore/YoyoBootDbContext.cs
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/Migrations/20230512081736_init5.Designer.cs
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
|
xusc
|
7a1c6afd2c
|
新增标准工时,产品物料清单界面
|
1 year ago |
|
lacy
|
3b1f84b477
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Service/基础设置/IImportExportExtAppService.cs
# src/aspnet-core/ICS.Application/Business/Service/基础设置/ImportExportExtAppService.cs
# src/aspnet-core/ICS.Application/IcsApplicationModule.cs
# src/aspnet-core/src/YoyoBoot.Application/YoyoBootApplicationModule.cs
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/EntityFrameworkCore/YoyoBootDbContext.cs
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/Migrations/YoyoBootDbContextModelSnapshot.cs
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
|
1411186949@qq.com
|
5748eba394
|
途程
|
1 year ago |
|
lacy
|
c8bbf8f7f2
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
|
1 year ago |
|
lacy
|
0d09bf074f
|
菜单
|
1 year ago |
|
xusc
|
240509685d
|
修改文件配置
|
1 year ago |
|
lacy
|
b0df5baefe
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
|
xusc
|
cc1e1502cd
|
冲突文件修改
|
1 year ago |
|
lacy
|
44f3589fb3
|
Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
# src/vue/src/shared/service-proxies/service-proxies.ts
|
1 year ago |
