Commit Graph

461 Commits (fa7a952dd6beb6feeaa111505c1467ba76bfb6be)
 

Author SHA1 Message Date
LML丶 2cd16dd40e Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java
1 year ago
LML丶 2b01910d78 工位与Bin位关系维护 1 year ago
微笑着面对明天 a8f28c5cbe 基础主数据bug 1 year ago
LML丶 e06f85e3c0 主页面输入查询条件后未按查询条件查询 1 year ago
jun 573ed6b5f8 SAP生产计划字段调整 1 year ago
jun 5c96e95600 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 4c79252fba 生产汇报bug修复 1 year ago
LML丶 5cc5637aea 主页面输入查询条件后未按查询条件查询 1 year ago
LML丶 4f5e0bc133 主页面输入查询条件后未按查询条件查询 1 year ago
jun 128f48e7f2 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesWorkOrderBtoExcelServiceImpl.java
1 year ago
jun 488a29951b 报工生产汇报修改 1 year ago
LML丶 1231b2c1c9 主页面输入查询条件后未按查询条件查询 1 year ago
LML丶 f91e0f5ea6 增加 班组信息 班组生产线对应关系维护 1 year ago
LML丶 2cbac10698 增加 班组信息 班组生产线对应关系维护 1 year ago
LML丶 b753707e29 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 48879c64fa 零件名称需模糊查询 1 year ago
gsz 97ccfbd6cb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz a32c922f12 Mes设备停机原因+设备停机类型 1 year ago
LML丶 c63a0607c8 零件名称需模糊查询 1 year ago
LML丶 bd98d58a8a 零件名称需模糊查询 1 year ago
LML丶 a5467131f3 唯一性校验:客户零件号+零件号+客户代码 1 year ago
LML丶 270b4941ea 新增时,需判定唯一,唯一条件,区域+产线+班次代码 1 year ago
LML丶 da8a39da4a 班次名称 查询条件未生效 1 year ago
LML丶 1523231d0f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 e3a4e7734c 修枚枚举路径 1 year ago
王杰 a4112d1ae0 mes enum 1 year ago
LML丶 e8bb24f6ea 点检 1 year ago
LML丶 64313ac6ca Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b71ac558e9 点检 1 year ago
jun 73933cbf74 40858 MES:创建工单:添加校验-选择生产线对应工作中心与物料版本中该物料对应工作中心是否一致 1 year ago
jun 0ecf86c5af 40855 MES-PC:生产工单添加查询条件-创建人 1 year ago
jun bf3f6ecc89 40794 产品工艺路线-新增报错 1 year ago
gsz 6c3c50a7b0 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 29e52d9524 Mes设备停机原因+设备停机类型 1 year ago
LML丶 2f02ede5e8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 0d187a5036 点检 1 year ago
jun 3d5058f5ad BTO工单日期 1 year ago
jun bc3f075d42 字段修改 1 year ago
gsz ea8eaa0969 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 9599dc038b MesMaximo查询仪表主数据+设备主数据接口 1 year ago
LML丶 73c0c71adb Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 9e6fc4fb05 点检 1 year ago
jun 3bcb6f6223 问题修复 1 year ago
jun e602b1a136 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 36e4f7d825 工单页面调整 1 year ago
LML丶 3386c6bbd7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b33d2adaca 点检 1 year ago
微笑着面对明天 a5549c343b 基础主数据 1 year ago
LML丶 4f8d2b7c04 点检 1 year ago
LML丶 459c46b3a6 点检 1 year ago