jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
555 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 'c651fa000b'
${ noResults }
Commit Graph

552 Commits (c651fa000ba35316169d5c665e7c11383725f104)

Author SHA1 Message Date
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
jun 387ef0be2f BUG修复 1 year ago
LML丶 c77ddb256b 新增 发运单 装车单 配置为空 1 year ago
LML丶 208a070319 增加枚举 1 year ago
LML丶 8ad6fbaa81 增加枚举 1 year ago
LML丶 3451fc5714 增加枚举 1 year ago
LML丶 a439883fdf 发运组 发运组代码唯一校验 1 year ago
LML丶 3d328898fe 发运组 发运组代码唯一校验 1 year ago
LML丶 a90b5cc23a 发运组 发运组代码唯一校验 1 year ago
LML丶 0802634dae 装车单 新增 增加状态 
明细 增加单号
 1 year ago
LML丶 beb84ec246 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 d3cc6b9c2c 装车单 新增 增加状态 
明细 增加单号
 1 year ago
jun c137e15e0a 40574 客户工厂-信息点维护-信息点校验 1 year ago
jun bf1fdbe013 40463 客户信息和客户工厂-在客户零件转换配置中维护后，还能继续删除 1 year ago
jun ef07171dc3 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 5c125bb4d5 SAP生产计划 1 year ago
LML丶 4433b6dc66 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 56f2b20056 新增bean repository 1 year ago
jun e54eb1e58e 界面配置(新增) 1 year ago
jun 3b6dabc2c8 40512 客户车型配置-3个不同的车型，明细一样，新添加车型后依然有前车型的明细 1 year ago
zhang.xw f43e7c6462 基础主数据bug 1 year ago
LML丶 aef501cba1 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
 1 year ago
LML丶 429d608f85 新增bean repository 1 year ago
zhang.xw 3e84587e53 基础主数据bug 1 year ago
zhang.xw bb727380ac 基础主数据bug 1 year ago
LML丶 78e691fcb7 新增bean repository 1 year ago
LML丶 9db8f63631 新增bean repository 1 year ago
LML丶 de1cbf2274 新增bean repository 1 year ago
LML丶 2688a7f23c 新增bean repository 1 year ago
LML丶 4a8cd12b2e 新增bean repository 1 year ago
LML丶 a5bb08ab22 新增bean repository 1 year ago
LML丶 849318174c 新增bean repository 1 year ago
LML丶 cf5014c08f 新增bean repository 1 year ago
LML丶 f548861191 新增bean repository 1 year ago
LML丶 67fc7ebffc 新增bean repository 1 year ago
LML丶 1046242ed7 新增bean repository 1 year ago
LML丶 00810b8eff 增加查询条件 1 year ago
LML丶 a2fe7a57ed 增加查询条件 1 year ago
LML丶 afa9baef86 增加查询条件 1 year ago
LML丶 4df13450e1 增加查询条件 1 year ago
LML丶 0b8b5d0b73 增加查询条件 1 year ago
LML丶 d4471fc18f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
 1 year ago
LML丶 d902071563 增加查询条件 1 year ago
zhang.xw dd2400800f 基础主数据开 1 year ago
LML丶 5578becfaa 增加查询条件 1 year ago
LML丶 98751db0e5 增加查询条件 1 year ago
LML丶 0974adbd05 增加查询条件 1 year ago
LML丶 5580f8f061 增加查询条件 1 year ago
LML丶 ba5d81e6e3 增加查询条件 1 year ago
LML丶 10183607e2 增加查询条件 1 year ago
LML丶 e2ce692320 增加查询条件 1 year ago
LML丶 aae21468f5 新增 枚举 1 year ago
LML丶 330f9aed05 新增 枚举 1 year ago
LML丶 5b820c8715 新增 枚举 1 year ago
LML丶 a680d658ef 新增 枚举 1 year ago
zhang.xw 79502bd1d3 基础主数据开 1 year ago
zhang.xw c95b3f265f 基础主数据开 1 year ago
LML丶 3059216f3c 新增 枚举 1 year ago
LML丶 eccb916cf7 新增 枚举 1 year ago
LML丶 01ab141291 新增 主数据bean 1 year ago
LML丶 ace93ba407 新增 主数据bean 1 year ago
LML丶 0250ea0677 新增 主数据bean 1 year ago
LML丶 d73c00a60b 新增 主数据bean 1 year ago
LML丶 c5505d85df 新增 主数据bean 1 year ago
zhang.xw 327e7f4f45 基础主数据开 1 year ago
LML丶 b5f42242b1 新增 主数据bean 1 year ago
LML丶 d308d3af07 新增 主数据bean 1 year ago
LML丶 9a4019b6a1 新增 主数据bean 1 year ago
LML丶 f88bc410e9 新增 主数据bean 1 year ago
LML丶 ef16e5c976 新增 主数据bean 1 year ago
LML丶 ef2d210a23 新增 主数据bean 1 year ago
LML丶 373e52aee4 新增 主数据bean 1 year ago
LML丶 b6f7c429fa 新增 主数据bean 1 year ago
LML丶 e75dfab77d 新增 主数据bean 1 year ago
LML丶 7a138400aa 新增 主数据bean 1 year ago
LML丶 1ccead6a0b 新增 主数据bean 1 year ago
LML丶 a790e6458a 新增 主数据bean 1 year ago
LML丶 99e32ba442 新增 主数据bean 1 year ago
LML丶 62d7057b22 新增 主数据bean 1 year ago
LML丶 adffc95ab4 新增 主数据bean 1 year ago
LML丶 525f478a01 新增 主数据bean 1 year ago
zhang.xw e9c2f6aded 基础主数据开 1 year ago
zhang.xw a6bb46a1cf webservice 支持 1 year ago
zhang.xw f73f5e4b11 基础属性新增 1 year ago
王杰 aa619aa98c init mes 1 year ago
王杰 fb15aba831 init mes 1 year ago
王杰 71be9b94d0 init mes 1 year ago
王杰 82c8f44764 init mes 1 year ago
王杰 a3be096ba4 init mes 1 year ago
王杰 24f100afcc 删除 'modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/.DS_Store' 1 year ago
王杰 bcf204a678 删除 'modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/.DS_Store' 1 year ago
王杰 e35a2c17d9 init mes 1 year ago
王杰 f1712a8ee1 init mes 1 year ago
王杰 f95997b5fe init mes 1 year ago
王杰 d252625a61 init mes 1 year ago
王杰 2c7464799a 删除 'modules/.DS_Store' 1 year ago
王杰 d5d08a37bf init mes 1 year ago
puxiao 69ccbf067f Finish Task#6320 23032-部品报缺报表 PCR-20240322 1 year ago
puxiao e73c7a4102 Finish Task#6320 23032-部品报缺报表 PCR-20240322 1 year ago
yxw 06bb19a415 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw dc188542fe 新建工单调WMS生成工单BOM 1 year ago
王杰 0e48ea437c jx mes 节拍报表 1 year ago
王杰 6c5f9e5300 jx mes 节拍报表 bug 1 year ago
王杰 da8539a0a7 嘉兴 mes 工单接口调整 节拍报表全工位接口调整 1 year ago
王杰 4124b2dfd8 修理票报表 1 year ago
yxw 3801d1436c 产线看板小时计划产量逻辑更改 1 year ago
yxw 96dca4e820 工单下达校验当前工单是否存在工单BOM 1 year ago
王杰 40084c90be 嘉兴 mes 节拍客制化报表 1 year ago
王杰 09f7451661 节拍 变更 1 year ago
王杰 a02b6c3f80 jx pcn 1 year ago
王杰 c59ad59c6f jx pcn 下线补录来源于DB的采集数据 1 year ago
yxw 6ec478b294 仅导入修改存在物料 1 year ago
王杰 e3adb21ee7 jx mes 对象结构 编辑 plc代码保存 1 year ago
yxw f17e92f6a5 出货检验报表查询条码明细 1 year ago
yxw fa35fc643a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw 92223877ba 物料导入数据去掉空格 1 year ago
王杰 20cf8163a8 jx mes 监控看板 工厂不良率 计算改成 除数乘100 1 year ago
yxw 416b98ee4d JxPrintPackageAndSpotTicketService打印模板增加打印参数 1 year ago
王杰 b3e5bddb26 看板 1 year ago
王杰 8815f6efc6 jx 看板 1 year ago
王杰 c11dea20a1 jx mes 生产线 1 year ago
王杰 561ea05a97 jx 1 year ago