8400 Commits (ae70490123703f465abc5ba03b7e928d48716f77)
 

Author SHA1 Message Date
王杰 ae70490123 sonar 4 years ago
王杰 03d95e2591 Merge branch 'dev' into test 4 years ago
王杰 b635c10750 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev 4 years ago
王杰 e66a560661 冲突 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 c06902f8de 冲突 4 years ago
曾贞一 462ed4f1de 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 7b3ef8f268 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 5af6f3ae7f 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
王杰 9b843e9496 sonar 4 years ago
王杰 39ed206a06 sonar 4 years ago
王杰 f0c09ca0e6 Merge branch 'test' into dev 4 years ago
王杰 2b89e35c69 pom 4 years ago
王杰 78b5bb0c08 Merge branch 'test' 4 years ago
王杰 bef695e533 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 4 years ago
王杰 7111a3b60f pojo 4 years ago
simon.song ca8ca18f34 数据同步接口修改查询条件 4 years ago
许心洁 cf83ab060d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
simon.song 24bd5ab668 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
4 years ago
simon.song ff5348bf99 中航看板取值修改 4 years ago
simon.song 9c51146117 数据迁移接口修改 4 years ago
王杰 1431721afc Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 4 years ago
王杰 5a0927299b 新建表报错 bug 4 years ago
simon.song 78a96c6583 mes管理端增加数据迁移功能相关接口 4 years ago
许心洁 5fae039262 合并测服代码 4 years ago
许心洁 22c55fc8c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang e967dde7a3 总屏幕看板优化 4 years ago
Dominic_Xiao 553fb09bc0 修改hql去除多余工厂代码条件 4 years ago
许心洁 410b95aefd Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml
4 years ago
simon.song db0d184aa3 数据迁移功能完成。 4 years ago
肖奕扬 9f0dfdb1fd Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
Dominic_Xiao cf908f2d04 卡斯马基础界面--客户条码规则、产品容器容量配置 4 years ago
puxiao.liao 696a0a8c3f 修复单据条码展开日期 4 years ago
王杰 25303ffc55 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 4 years ago
王杰 5a5874b137 test 4 years ago
王杰 45a1b63a23 Merge branch 'test' 4 years ago
王杰 84d9ec15f2 pom 4 years ago
王杰 f1db936f42 pom 4 years ago
王杰 d2f03a966e Merge branch 'dev' into test 4 years ago
joke.wang 5e1fac42fe 12112 设备周期作业计划需要与作业要求进行关联 4 years ago
yumingxing 86a6fb1390 报表2021026 4 years ago
肖奕扬 53401e1d19 Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
yumingxing ca50493d20 报表20210125 4 years ago
puxiao.liao c8d97daa58 Fix bug#13248 4 years ago
puxiao.liao 983565aca1 Fix bug#13752 4 years ago
joke.wang 378993b225 包装条码补打优化 4 years ago
王杰 0183ca2a05 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 4 years ago
陈思洁 85ebb5ce78 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 01877b80d5 【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】 4 years ago
Dominic_Xiao 81e63fe7d2 Merge remote-tracking branch 'origin/test' into test 4 years ago