qianhs
17b27da539
BH-CODE 出库,绑定
5 years ago
王杰
f64d894a4d
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
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
王杰
2da169d51f
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
5 years ago
王杰
648d8662b5
[任务:1851 安灯升级配置变更]
5 years ago
钮海涛
999a415d27
修复版本问题
5 years ago
钮海涛
911236ef8e
修复版本问题
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
wynne1005
a2182f5e42
Merge branch 'test'
5 years ago
wynne1005
e11f9d07d0
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
5 years ago
王杰
8792d72247
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
5 years ago
王杰
654f1dcc84
【任务:1845,安灯】
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