jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
676 Commits
21 Branches
24 Tags
10 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-nht-2503130000-shipping
dev_temp_xw_202503170000_45656
uat-temp-nht-chengdu-loading
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat
test
dev_temp_xw_202503120000_45631
uat-temp-logic-20250313-45610
dev
uat-temp-nht-2503040000-seres
uat-temp-wj-2502060000-chongqing-step
dev_temp_xw_20250305_45455
test-temp-wj-250117-pack
uat-temp-castle-250211-44248
uat-temp-nht-2502100000-45019
uat-temp-wj-250124-equ-check-step
dev-temp-xw-202501150000-44852
dev-temp-xw-202501031219-44700
master
yfai-mes-ext-v3.3
yfai-mes-ext-v3.2
yfai-mes-ext-v3.11
yfai-mes-ext-v3.1
yfai-mes-ext-v3.0
yfai-mes-ext-v2.9
yfai-mes-ext-v2.8
yfai-mes-ext-v2.7
yfai-mes-ext-v2.5
yfai-mes-ext-v2.4
yfai-mes-ext-v2.3
yfai-mes-ext-v2.2
yfai-mes-ext-v2.1
yfai-mes-ext-v2.0
yfai-mes-ext-v1.9
yfai-mes-ext-v1.8
yfai-mes-ext-v1.7
yfai-mes-ext-v1.6
yfai-mes-ext-v1.5
yfai-mes-ext-v1.4
yfai-mes-ext-v1.3
yfai-mes-ext-v1.2
yfai-mes-ext-v1.1
yfai-mes-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2d9e5bd025'
${ noResults }
Commit Graph

673 Commits (2d9e5bd025def82cb45f90662a23df61173cf073)

Author SHA1 Message Date
LML丶 be5d161874 增加查询条件 12 months ago
LML丶 0a97500eac 增加查询条件 12 months ago
LML丶 19e407cae3 修改接口 12 months ago
LML丶 d2da4e449d 修改接口 12 months ago
LML丶 e052858c6b 修改接口 12 months ago
LML丶 12aa742fe0 修改接口 12 months ago
LML丶 8855a848bd 修改表字段 12 months ago
LML丶 df7436e81c 修改表字段 12 months ago
LML丶 ea7037e44a Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 0db692de60 修改表字段 12 months ago
微笑着面对明天 3c9608ab18 基础主数据bug 12 months ago
LML丶 bd7a1e6249 修改表字段 12 months ago
gsz e150f8a1d2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 796c7fafa2 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 
 Conflicts:
	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
 12 months ago
LML丶 fa7a952dd6 修改表字段 12 months ago
gsz 71873fb9e5 QMSCCSC检测任务 12 months ago
LML丶 7c7361e7a6 修改表字段 12 months ago
LML丶 0c74686e3b 修改表字段 12 months ago
LML丶 f1cf01c8e1 修改表字段 12 months ago
LML丶 4e5859f042 修改表字段 12 months ago
LML丶 0456566231 修改表字段 12 months ago
LML丶 d1882b87db 修改表字段 12 months ago
LML丶 904f990ba2 修改表字段 12 months ago
LML丶 f1b536be1b 修改表字段 12 months ago
LML丶 e6b22b541d 修改表字段 12 months ago
LML丶 6a80a9b059 修改表字段 12 months ago
LML丶 ecbbecd0a2 修改表字段 12 months ago
LML丶 27479d8c0e 修改表字段 12 months ago
LML丶 cfe42bf2d4 修改表字段 12 months ago
LML丶 5c153d8f2d 修改表字段 12 months ago
LML丶 bab0ecc946 修改表字段 12 months ago
LML丶 9c1817b543 修改表字段 12 months ago
LML丶 54f78e5aa9 修改表字段 12 months ago
LML丶 7e1b7464b4 修改表字段 12 months ago
LML丶 e16d225610 修改表字段 12 months ago
LML丶 0eac845a45 修改表字段 12 months ago
LML丶 b467cec302 修改表字段 12 months ago
LML丶 3eae48e188 修改表字段 12 months ago
LML丶 b08431ccae 修改表字段 12 months ago
LML丶 e1645c99d3 修改表字段 12 months ago
LML丶 9a76f2d9bc 修改表字段 12 months ago
gsz 91fd5c4d91 模具映射关系维护 12 months ago
微笑着面对明天 cfc3af073f Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 3a5ee5a221 基础主数据bug 12 months ago
微笑着面对明天 37b7acf15c 基础主数据bug 12 months ago
gsz 39db1c5201 Maximo 增加描述 12 months ago
LML丶 f32c1dcb03 修改表字段 12 months ago
LML丶 dfcf5c0308 修改表字段 12 months ago
LML丶 8704b44eb6 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 f361dd372a 修改表字段 12 months ago
gsz b0ac2d9e93 枚举明细bug修改 12 months ago
gsz 5374272ddd bug修改 12 months ago
微笑着面对明天 90dd8bf7db Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 b73a32f25d 基础主数据bug 12 months ago
jun 838aeed985 演示功能修复 12 months ago
gsz 306ddf5fe7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz 27ce83c06c Mes枚举主表&枚举明细配置 12 months ago
LML丶 86c7299106 修改表字段 12 months ago
jun e89d97f765 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 336431f6e5 字段变更 12 months ago
微笑着面对明天 e3e392b5ea 基础主数据bug 12 months ago
微笑着面对明天 079da0588c 基础主数据bug 12 months ago
LML丶 023b707814 修改表字段 12 months ago
微笑着面对明天 e2c6822345 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 2d8687ef67 基础主数据bug 12 months ago
LML丶 c1ecacac9e 修改表字段 12 months ago
LML丶 5668c64322 修改表字段 12 months ago
LML丶 471b386ec0 修改表字段 12 months ago
LML丶 7088d5b456 修改表字段 12 months ago
LML丶 2c9fa1b8a9 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 1db487a26b 修改表字段 12 months ago
jun 788eb76c98 SAP生产计划代码逻辑变更 12 months ago
jun b1735050d3 SAP生产计划代码错误 12 months ago
LML丶 64e17bba45 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 d3693836ca 修改表字段 12 months ago
jun f62bd6c249 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 799013d0b5 SAP生产计划代码错误 12 months ago
LML丶 27890b20a7 修改表字段 12 months ago
LML丶 ebdea2938b 修改表字段 12 months ago
LML丶 f19f674d64 修改表字段 12 months ago
jun 72b41b32b1 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 630bf2dd61 SAP生产计划逻辑调整 12 months ago
gsz a881b3ec49 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz f7bcdab3d7 Mes-Maximo仪表主数据&模具映射关系维护 12 months ago
LML丶 550f3eb930 发运逻修改 12 months ago
LML丶 c5ddfe0c9f 发运逻修改 12 months ago
LML丶 ec6cfd5905 发运逻修改 12 months ago
LML丶 df880ec4e3 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 b628c49ec1 编译错误 注释 12 months ago
微笑着面对明天 a70747d259 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 71a2d40140 基础主数据bug 12 months ago
jun d583285fea 配置文件提交 12 months ago
微笑着面对明天 cc11385979 基础主数据bug 12 months ago
王杰 55cf372318 yfai 数据源 12 months ago
LML丶 09e1914ead 编译错误 注释 12 months ago
LML丶 049d43a18e Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 e8938ce8e6 编译错误 注释 12 months ago
王杰 9857eee02d mes ext 12 months ago
微笑着面对明天 afeb428774 基础主数据bug 12 months ago
LML丶 f2cb92d67a 编译错误 注释 12 months ago
LML丶 9af55a792a 编译错误 注释 12 months ago
LML丶 321f27d30f 编译错误 注释 12 months ago
微笑着面对明天 16b927606a 基础主数据bug 12 months ago
微笑着面对明天 274297a51a 基础主数据bug 12 months ago
微笑着面对明天 dce3e8e0ab 基础主数据bug 12 months ago
LML丶 f11181dfb5 编译错误 注释 12 months ago
LML丶 1774946880 编译错误 注释 12 months ago
LML丶 b3b7ddeabe 增加字段 12 months ago
LML丶 5811900705 工位与Bin位关系维护 12 months ago
LML丶 55b6217a9a 工位与Bin位关系维护 12 months ago
LML丶 f48ba3af54 工位与Bin位关系维护 12 months ago
微笑着面对明天 29c7d167cf 基础主数据bug 12 months ago
微笑着面对明天 504f642bcb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
微笑着面对明天 502f97bb22 基础主数据bug 12 months ago
LML丶 03227dd376 工位与Bin位关系维护 12 months ago
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
 12 months ago
LML丶 2b01910d78 工位与Bin位关系维护 12 months ago
微笑着面对明天 a8f28c5cbe 基础主数据bug 12 months ago
LML丶 e06f85e3c0 主页面输入查询条件后未按查询条件查询 12 months ago
jun 573ed6b5f8 SAP生产计划字段调整 12 months ago
jun 5c96e95600 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
jun 4c79252fba 生产汇报bug修复 12 months ago
LML丶 5cc5637aea 主页面输入查询条件后未按查询条件查询 12 months ago
LML丶 4f5e0bc133 主页面输入查询条件后未按查询条件查询 12 months 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
 12 months ago
jun 488a29951b 报工生产汇报修改 12 months ago
LML丶 1231b2c1c9 主页面输入查询条件后未按查询条件查询 12 months ago
LML丶 f91e0f5ea6 增加 班组信息 班组生产线对应关系维护 12 months ago
LML丶 2cbac10698 增加 班组信息 班组生产线对应关系维护 12 months ago
LML丶 b753707e29 Merge remote-tracking branch 'origin/dev' into dev 12 months ago
LML丶 48879c64fa 零件名称需模糊查询 12 months ago
gsz 97ccfbd6cb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 12 months ago
gsz a32c922f12 Mes设备停机原因+设备停机类型 12 months ago
LML丶 c63a0607c8 零件名称需模糊查询 12 months ago
LML丶 bd98d58a8a 零件名称需模糊查询 12 months ago
LML丶 a5467131f3 唯一性校验：客户零件号+零件号+客户代码 12 months ago
LML丶 270b4941ea 新增时，需判定唯一，唯一条件，区域+产线+班次代码 12 months ago
LML丶 da8a39da4a 班次名称 查询条件未生效 12 months ago
LML丶 e3a4e7734c 修枚枚举路径 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 修改描述 1 year ago
LML丶 57b532da86 修改描述 1 year ago
LML丶 d33ace46fb 修改描述 1 year ago
LML丶 30c2122c15 修改描述 1 year ago
LML丶 aa1ba2b717 修改描述 1 year ago
jun ce50fccc87 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun b2b72e8c7d 工单导入 1 year ago
gsz 9b2531eb1c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 32655d74de 给maximo提供新增仪表主数据+设备主数据接口 1 year ago
jun e24580595d 报工数量卡控 1 year ago
jun b44cf508dc Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun fdb1ff8d82 40757 MES-PC：物料信息：新增字段【物料类型】与WMS物料类型枚举一致，新增编辑正常下拉选择 1 year ago
gsz 6463468513 maximo仪表主数据+设备主数据接口 1 year ago
jun 320c620333 设备加工参数维护 1 year ago
jun ddde8d27ab Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 326d7ffb2f 腔组维护增加名称 1 year ago
LML丶 c3ed51b7a1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 5f36c07720 修改描述 1 year ago
jun b1d4bbd23c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 960e478536 模具腔组主数据(3个页面) 1 year ago
gsz d1eaebe991 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz 9bf9dac36e MES装车组+装车组详情 1 year ago
LML丶 7ff8a229bd 修改描述 1 year ago
jun 2c1917ac02 工艺路线明细逻辑修改 1 year ago
LML丶 5e6264b0cc 修改描述 1 year ago
LML丶 b543a5deb5 修改描述 1 year ago
LML丶 d13ef03421 修改描述 1 year ago
LML丶 f67f60584a 修改描述 1 year ago
LML丶 eafdd794ac Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b8fd0e9419 修改描述 1 year ago
gsz f1057cdb70 MES产品工艺路线修改 1 year ago
jun 7e53c893cf 类名修改 1 year ago
jun 0fa2418933 工艺路线开发 1 year ago
gsz 3333977b93 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 1 year ago
gsz b8a152e47f MES产品工艺路线新增生产区域代码areaCode 1 year ago
LML丶 e48469618d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 f7d32ba83b 修改描述 1 year ago
gsz e2ff38d219 MES产品工艺路线开发 1 year ago
LML丶 c04c83b504 修改描述 1 year ago
jun 6aa74526fb 工艺路线开发 1 year ago
LML丶 b07a18b86f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 7dd6ca6ea9 修改描述 1 year ago
jun 58f4c91e5a 生产版本优化 1 year ago
LML丶 10a62322d2 修改描述 1 year ago
LML丶 76da2658f2 修改描述 1 year ago
jun a58ef48f16 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 9767bd5af5 发送sap生产计划逻辑变更 1 year ago
LML丶 dfb72bbd0c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 bf84728bc2 修改字段 1 year ago
jun 5fc061f2f9 字段修改 1 year ago
jun c714570d0d 工艺，工艺工序关系基础信息维护 1 year ago
LML丶 4d12985007 修改字段 1 year ago
LML丶 78f1e743b8 修改字段 1 year ago
LML丶 036aae4b79 修改字段 1 year ago
LML丶 0507e31ae1 修改字段 1 year ago
LML丶 0dd67a5ef9 修改字段 1 year ago
LML丶 3217407694 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 c6eb3bac25 修改字段 1 year ago
jun e2fc0df9f3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 9b92111034 更新工单完成数量 1 year ago
LML丶 832b04842c 修改字段 1 year ago
LML丶 242b5a4f6d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 768487f28f 零件发运组-圆整方式 枚举修改 1 year ago
jun 76f35628d3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun ac5a142300 生产汇报开发 1 year ago
gsz b8a7f4e2a6 2024-05-10 新增SAP2MES & MES2SAP 接口映射 1 year ago
jun c326833687 生产工单开发 1 year ago
jun 61a3944368 暂时修改为单数据源 1 year ago
LML丶 b22ccc606f 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 28ad2676de 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 bcd9ed9f2f 零件发运组-圆整方式 枚举修改 1 year ago
LML丶 88565ac8a3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 f092f6f434 零件发运组-圆整方式 枚举修改 1 year ago
jun 566bb1d67d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 24e2a087f9 40564 客户零件转换配置-明细-两条数据的明细数据一样，新增一条明细，两个数据都有 1 year ago
LML丶 c9ca2e0d34 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 18a620dd04 零件发运组-圆整方式 枚举修改 1 year ago