8396 Commits (4840627a7fc6c0624a4a637cbe98cc11d2ed042b)

Author SHA1 Message Date
陈思洁 e3a558913b 【3566 20063-鉴定报工-20210618】 4 years ago
陈思洁 28474c8aba Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 fc8619208a pom 4 years ago
王杰 1f1acc05a3 Merge branch 'test' into ext-dev 4 years ago
王杰 a71774ba24 pom 4 years ago
王杰 3e63b97bc3 Merge branch 'test' into dev 4 years ago
王杰 c14eb6e0bb pcn 4 years ago
王杰 21ca70f863 pom 4 years ago
王杰 c6bc2e682a Merge branch 'test' into dev 4 years ago
jun bda7b30475 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 21247058a8 bsp client 新增model 4 years ago
castle.zang f93e282d11 bsp server pojo 4 years ago
puxiao.liao 0a148e4035 增加质检枚举信息 4 years ago
Dominic_Xiao 7a92162ca6 卡斯马锁定记录表增加工位名称字段 4 years ago
puxiao.liao 339538fa71 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
钮海涛 30b5d431c1 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 c43eba89f3 新增三力士换模时间计算 4 years ago
wynne1005 d6b2bce9b0 fix(screen): 6.21 枚举调整 增删改查测试
6.21 枚举调整 增删改查测试
4 years ago
puxiao.liao 17151a9b79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao a63ce49a89 修改单据明细查询 4 years ago
joke.wang e0e1231e09 16381 19081-andon事件处理-增加字段 4 years ago
wynne1005 5e6a2d8839 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 3544aa076e 天津it审核需求 4 years ago
王杰 005d3ef8f9 物料 4 years ago
Dominic_Xiao 5a354229f7 泰国电检 4 years ago
Dominic_Xiao 66c627a698 新增泰国扭矩产线专用条码生成规则 4 years ago
陈思洁 9ea5b11f20 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 02cf004828 【3566 20063-鉴定报工-20210618】 4 years ago
puxiao.liao a4bc97c5da Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao 1b01f74f42 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao 33b4b60c38 报废率趋势优化 4 years ago
joke.wang 8b5447f5ca 停机统计报表 4 years ago
castle.zang 5756e5ccd9 合并代码 4 years ago
castle.zang 265dcdbcb1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into remoteDev 4 years ago
castle.zang cbef156ac2 方法调用工具类 4 years ago
castle.zang f9332cd514 方法调用工具类 4 years ago
nies 69821a54aa 删除 .bak文件 4 years ago
nies 46daa2c1cd bsp 新增client端model 4 years ago
Dominic_Xiao 6947405f44 16328 20135--锁定记录增加零件码这个字段--2021-06-23 4 years ago
陈思洁 9c4b0b44f1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 0170a86f60 【3484 20063-待处理报工基础数据-20210610】 4 years ago
nies b545d4928a SYSMENU 新增字段 4 years ago
jun 0a8ad27fbb Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
castle.zang 6c79b95bf2 refactor modules name 4 years ago
castle.zang c34e72f7aa 表名和列名修改为大写字母 4 years ago
castle.zang 9b2e0e8508 bsp-server bean 和 repository 4 years ago
宋双双 bef8415707 更新 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java'
泰国需求:接口表增加PACKAGE_NO字段索引
4 years ago
陈思洁 5cda292bc2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 29d62c4334 【3484 20063-待处理报工基础数据-20210610】 4 years ago
Dominic_Xiao 35e41f94e1 卡斯马锁定记录表锁定状态赋默认值 4 years ago
Dominic_Xiao dbdcbec032 产品工序过程报表新增料架号字段 4 years ago
Dominic_Xiao e82043a798 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao aa78fd8bd5 卡斯马异常锁定 4 years ago
puxiao.liao 9333bfc996 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao fe3416a736 查询条件的新增 4 years ago
Dominic_Xiao 27ceea4113 16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18 4 years ago
钮海涛 7150f1c51f Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 eeb9ab500b 排程结果优化 4 years ago
puxiao.liao 93906742a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
陈思洁 ee42edc94c 【3484 20063-待处理报工基础数据-20210610】 4 years ago
puxiao.liao 66fb8e5894 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 9cfcb2a59d 查询条件的增加&PO增加库存地字段 4 years ago
wynne1005 321209f2b4 Merge branch 'test' into ext-dev 4 years ago
wynne1005 e7df36d3e9 还原merge pom 4 years ago
wynne1005 69d872be7e Merge branch 'dev' into test 4 years ago
wynne1005 7aa3d4bddf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 2b0a7198a5 fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
4 years ago
puxiao.liao 2acc57e72d Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
joke.wang 470b05ebf0 北京ptl亮灯 4 years ago
rock.yu 38126d9812 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
4 years ago
rock.yu 40fc186ed6 BOM, Locate POJO 增加索引 4 years ago
王杰 a321a28759 Merge branch 'test' into ext-dev 4 years ago
Dominic_Xiao 5bf2121c92 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao 778df56d2e 16217 20135--增加料架需要跟生产线绑定关系--2021-06-08
16162 20135--自动操作增加工号扫码(在每一个工位第一步扫码工号,每操作一次需要扫描一次工号)--2021-06-28
16152 20135--异常锁定,解锁和解锁记录--2021-06-25
4 years ago
王杰 4fe445e4c3 test merge dev 4 years ago
陈思洁 ce8a66d83a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 4d5cdc710e 【16023 19081-部分工位安灯呼叫没有反应、呼叫成功无法取消和处理-20210525】 4 years ago
puxiao.liao 582f4ba81a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 7125556090 盘点查询增加状态查询 4 years ago
曾贞一 561717b7a3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 8b4bd8d8ab 【中航-优化委外发运业务】 4 years ago
puxiao.liao 4d5888ae36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 1835890e4c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao d952e7a8e9 采购收货进度报表增加列查询,窗口开始时间,窗口结束时间 4 years ago
puxiao.liao 2f903e07fa Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 224e3a9a51 字段和枚举的新增 4 years ago
puxiao.liao de75b43008 增加质检枚举信息 4 years ago
puxiao.liao 590c433b89 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao c67f263e5d 卡斯马不良品处理格式化代码 4 years ago
joke.wang cda0f670eb 16198 19081-工位工时统计 4 years ago
joke.wang 110cc85b6e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
wynne1005 261d5b3655 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
puxiao.liao a8b163261d mysql 版本修改 4 years ago
puxiao.liao 46085f9051 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
钮海涛 81bbe8476a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 6e6b0a7c11 排程结果优化 4 years ago
puxiao.liao b31342c5db Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Xiao-yin0517 e7f5397e59 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
Xiao-yin0517 b9bae06c0c 更改实体字段,添加实体 4 years ago
puxiao.liao 2580841944 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago