2486 Commits (370b09972906d530e4336fc26d0c11f78e54cfd5)

Author SHA1 Message Date
puxiao.liao e57acfacee BH BUG 修改 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库,绑定 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
puxiao.liao d3f2434aa0 Fix bug#8752,8753 5 years ago
曾贞一 6e70e3257b 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
钮海涛 5643f1aab4 Merge remote-tracking branch 'origin/test' into test 5 years ago
wynne1005 85f99fcdfa 提测 还原pom 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
wynne1005 5f80cc4322 Merge branch 'dev' into test 5 years ago
钮海涛 5610e5a455 完成SWEB任务 5 years ago
puxiao.liao 47a7a0a9a3 BH 需求报表的修改 5 years ago
puxiao.liao 7f76cf0ad3 BH 需求修改 5 years ago
qianhs 86f6fefd5b BH-CODE 出库,绑定 5 years ago
钮海涛 7286ce7ebb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 f7c42ee90d Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
5 years ago
puxiao.liao 1b84b3aeee Fix bug#8637,8697 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
puxiao.liao b5aa990ea7 Fix bug#8633 5 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 5 years ago
puxiao.liao 7353b79b9c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 944b400f1e Fix bug#8679 5 years ago
qianhs b474ef1266 Finish Task #1813 Cost:32h
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 043e71649a bh子检测项新增检测大类 5 years ago
钮海涛 da21795f7f Merge branch 'test' into dev 5 years ago
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 d65d9a5a1d Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 8bca38a17d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
5 years ago
puxiao.liao e793667812 BH 需求变更 5 years ago
钮海涛 e2e48f31bd bh子检测项新增检测大类 5 years ago
钮海涛 f4cccf5c9b 修改微服务model接口 5 years ago
钮海涛 81b5262a24 修改微服务model接口 5 years ago
曾贞一 cf507fdb48 【BATCH录入检测值-需要变更】 5 years ago
钮海涛 c344f017a9 修复sonar上的问题 5 years ago
钮海涛 52f3758cee Merge remote-tracking branch 'origin/dev' into dev 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
wynne1005 81753d3260 Merge branch 'dev' into test 5 years ago
wynne1005 81b554fc8b Merge branch 'test' 5 years ago
曾贞一 9e236a06a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6fc4641033 【BATCH录入检测值-需要变更】 5 years ago
puxiao.liao c2942b8a0d BH 需求变更 5 years ago
puxiao.liao 583c750055 BH 需求变更 5 years ago
puxiao.liao 4f56baadef Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 71d936cc56 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 b060ba97aa 修改BH同步JOB逻辑 5 years ago
puxiao.liao 75308c8989 BH 需求变更 5 years ago
puxiao.liao 1dc9276e9a BH 需求变更 5 years ago
钮海涛 e91a6821bc Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java
5 years ago
钮海涛 efc30f713f 修改BH同步JOB逻辑 5 years ago
曾贞一 627b417256 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 765e0619ca 【BATCH录入检测值-需要变更】 5 years ago
puxiao.liao 8c3f81292c BH 需求变更 5 years ago
puxiao.liao c06fee639d BH 需求变更 5 years ago
qianhs 17b27da539 BH-CODE 出库,绑定 5 years ago
曾贞一 33c0ab4015 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 a4fdf07b4b 【BATCH录入检测值-需要变更】 5 years ago
曾贞一 470e4986a9 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java
5 years ago
曾贞一 72817fca4a 【BATCH录入检测值-需要变更】 5 years ago
钮海涛 6d1c0bb46d 修改BH基础数据 5 years ago
钮海涛 ad79c9fd7b 修改BH基础数据 5 years ago
puxiao.liao 99955a70ff bug7940【7940 推荐入库-未按最近距离推荐】 5 years ago
puxiao.liao 443486a8cf BH 需求变更-增加产品条码信息 5 years ago
qianhs 1a018d4af5 1,产品条码事务实体类提交 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 a5a032debe 解决model生成数据库表问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
puxiao.liao 491bc32325 Fix Bug#8345 5 years ago
钮海涛 27c62aa7d1 合并冲突 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e578cb882a 优化通用模板代码模糊查询功能 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
钮海涛 281a2dccb5 新增零件自动采购单 5 years ago
钮海涛 4ba0e6b264 自动生成采购订单功能 5 years ago
钮海涛 8a2d54ce61 临时保存 5 years ago
曾贞一 e3accbf24e 【8441 收货回执打印功能完善】 5 years ago
曾贞一 d0e4af979e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6a28329d75 【8441 收货回执打印功能完善】 5 years ago
puxiao.liao f8ccd0166e BUG【8554】 中航-工装初始化导入后,一个excel应该产生一笔事物,明细按物料分 5 years ago
钮海涛 6c7a88b962 bug:【8520】 5 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
袁津哲 3e65986585 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 0e2f50e562 Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
王杰 786c442d55 解决冲突 5 years ago