宋军超
9eda1f67b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
40672559e4
修改sonar--BUG类型问题
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
wynne1005
0636daed51
Finish Task:1896 Cost:8h
5 years ago
陈思洁
677cc85360
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
b2384619d4
【1891 队列条码打印-管理端】
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
宋军超
fd9a2e6d15
Start Task #1887 Cost:8h Left:8h
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
王杰
074093a46d
[任务:1850 ,安灯流程设计]
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
f4c4b4a1f6
1,产品条码事务实体类提交
5 years ago
qianhs
1a018d4af5
1,产品条码事务实体类提交
5 years ago
joke.wang
dd179a6d89
Fix Bug #8636
5 years ago
joke.wang
1a72c16f14
Finish Task #1890 Cost:8h
5 years ago
wynne1005
b48ba8c481
Finish Task #1876 Cost:32h
5 years ago
wynne1005
8aef23e4ad
Finish Task #1876 edi webservice解析 Cost:32h
5 years ago
陈思洁
4d63f9817e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
9b8342b7f5
【1865 客户JIT生产队列,自动下达定时JOB】
5 years ago
王杰
648d8662b5
[任务:1851 安灯升级配置变更]
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
贾文涛
a68475d3d0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
贾文涛
a8efa90089
bug 7461,count时去掉distinct。Fix Bug #7461
5 years ago
钮海涛
27c62aa7d1
合并冲突
5 years ago
袁津哲
cad6b7ad89
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
e578cb882a
优化通用模板代码模糊查询功能
5 years ago
袁津哲
f50b76cd1f
Task1858:电枪枪头更换计数
5 years ago
陈思洁
5b167546e4
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
陈思洁
e42641855d
【8528 收货检验-图片上传】
5 years ago
wynne1005
608aa6be90
还原pom
5 years ago
wynne1005
99d3c9d721
提测合并 还原pom
5 years ago
wynne1005
6dd2f12a2a
Merge branch 'dev' into test
5 years ago
wynne1005
5ef88c80c0
提测合并 还原pom
5 years ago
王杰
56ae714283
【任务:1845,安灯】
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
wei.peng
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
5 years ago
wei.peng
f161270af8
版本发布
5 years ago
钮海涛
c0303cc247
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
钮海涛
281a2dccb5
新增零件自动采购单
5 years ago
王杰
8e94cbb8fa
pojo 序列号
5 years ago
袁津哲
8b63dea809
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
08b03c9eb8
Task1858:电枪枪头更换计数
5 years ago
钮海涛
8059342b8f
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
钮海涛
4ba0e6b264
自动生成采购订单功能
5 years ago
宋军超
8d2f6fb8d1
任务:【1842】-海纳川基础数据修改字段类型
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
袁津哲
e47f050ff3
优化通用导入工具类和导入逻辑
5 years ago
joke.wang
e2ce63a9cd
bug: [8533] plc数据类型改为枚举
5 years ago
钮海涛
6c7a88b962
bug:【8520】
5 years ago
joke.wang
88a0d6d02f
任务:[1828] 半成品绑定工步增加逻辑
5 years ago
宋军超
0ccadab4be
任务:【1842】-海纳川通用导入修改对应工具类、实体和model
5 years ago
陈思洁
8ab6e77620
【8528 收货检验-图片上传未开发】
5 years ago
宋军超
1f55c06368
任务:【1842】-海纳川通用导入添加对应工具类、实体和model
5 years ago
袁津哲
5d1c79ef13
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
5 years ago
袁津哲
6e3da00fda
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
5 years ago
陈思洁
7eb72ee5d1
【调试接口回传和同步】
5 years ago
袁津哲
3e65986585
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
0e2f50e562
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
5 years ago
宋军超
9778561725
任务:【1842】-添加海纳川基础数据维护模块
5 years ago
陈思洁
a1c0b6ff26
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
陈思洁
1ea5b54052
【生成质检单增加是否让步字段】
5 years ago
joke.wang
b741b6950b
bug: [8516] 重新计算bug 1
5 years ago
王杰
786c442d55
解决冲突
5 years ago
宋军超
18e037da7f
任务:【1842】-添加海纳川基础数据的Repository
5 years ago