Commit Graph

938 Commits (41cfa4e252e411918d586de263d10c2afa888e14)
 

Author SHA1 Message Date
LML丶 1523231d0f Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 e3a4e7734c 修枚枚举路径 12 months ago
王杰 a4112d1ae0 mes enum 12 months ago
LML丶 e8bb24f6ea 点检 12 months ago
LML丶 64313ac6ca Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b71ac558e9 点检 12 months ago
jun 73933cbf74 40858 MES:创建工单:添加校验-选择生产线对应工作中心与物料版本中该物料对应工作中心是否一致 12 months ago
jun 0ecf86c5af 40855 MES-PC:生产工单添加查询条件-创建人 12 months ago
jun bf3f6ecc89 40794 产品工艺路线-新增报错 12 months ago
gsz 6c3c50a7b0 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 29e52d9524 Mes设备停机原因+设备停机类型 12 months ago
LML丶 2f02ede5e8 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 0d187a5036 点检 12 months ago
jun 3d5058f5ad BTO工单日期 12 months ago
jun bc3f075d42 字段修改 12 months ago
gsz ea8eaa0969 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 9599dc038b MesMaximo查询仪表主数据+设备主数据接口 12 months ago
LML丶 73c0c71adb Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 9e6fc4fb05 点检 12 months ago
jun 3bcb6f6223 问题修复 12 months ago
jun e602b1a136 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 36e4f7d825 工单页面调整 12 months ago
LML丶 3386c6bbd7 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b33d2adaca 点检 12 months ago
微笑着面对明天 a5549c343b 基础主数据 12 months ago
LML丶 4f8d2b7c04 点检 12 months ago
LML丶 459c46b3a6 点检 12 months ago
LML丶 d14e573673 点检 12 months ago
LML丶 1226a69a81 点检 12 months ago
LML丶 e47e4d5728 点检 12 months ago
LML丶 fc80bdfbe5 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 3f494d81df 点检 12 months ago
jun dafda27e66 枚举位置修改 12 months ago
jun 40d925a5c0 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
12 months ago
jun 7384626734 枚举位置移动 12 months ago
LML丶 78fbf4fd80 修改描述 12 months ago
LML丶 c79be357c2 修改描述 12 months ago
LML丶 9a48a78c4d 修改描述 12 months ago
LML丶 57b532da86 修改描述 12 months ago
LML丶 d33ace46fb 修改描述 12 months ago
LML丶 30c2122c15 修改描述 12 months ago
LML丶 aa1ba2b717 修改描述 12 months ago
jun ce50fccc87 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun b2b72e8c7d 工单导入 12 months ago
gsz 9b2531eb1c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 32655d74de 给maximo提供新增仪表主数据+设备主数据接口 12 months ago
jun e24580595d 报工数量卡控 12 months ago
jun b44cf508dc Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun fdb1ff8d82 40757 MES-PC:物料信息:新增字段【物料类型】与WMS物料类型枚举一致,新增编辑正常下拉选择 12 months ago
gsz 6463468513 maximo仪表主数据+设备主数据接口 12 months ago