钮海涛
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
钮海涛
c1241bd6c5
修复版本问题
5 years ago
钮海涛
53a421b3b9
修复版本问题
5 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
5 years ago
曾贞一
60dee04206
【8512 中航-BH检测结果管理-查询条件无效】
5 years ago
曾贞一
ecd888db6f
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
曾贞一
ec77182944
【BATCH录入检测值-查询优化】
5 years ago
王杰
029763feb1
pom
5 years ago
王杰
30fcf4f23f
pom冲突
5 years ago
汪云昊
717f268c28
POJO版本号还原
5 years ago
钮海涛
281ef662b1
merge test
5 years ago
puxiao.liao
e74f3d6d99
BUG#8438【20011-- 六合一改数按钮逻辑错误,打开改数按钮时,输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】
5 years ago
qianhs
7778ce1afd
类序列号
5 years ago
袁津哲
44eef89b40
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
4b09d9fa8d
修改报错
5 years ago
qianhs
3462e33aac
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
qianhs
0e5bf3488b
盘点
5 years ago
袁津哲
486e655394
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
7b5736d717
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
5 years ago
qianhs
c38757de19
盘点
5 years ago
钮海涛
f1d14c9e3a
bug:【8385】-报工事务查询联调报表查询功能。
5 years ago
puxiao.liao
8d386caa71
1776 工装初始化-新增箱条码与库位匹配检查组件
5 years ago
puxiao.liao
8e8744d3db
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
e8dd3ab12f
8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String)
5 years ago
曾贞一
c85fd2eff0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
曾贞一
24ea607718
【8441 收货回执打印功能完善】
5 years ago
袁津哲
0ddd92e4f8
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
0bafa0de52
开发调试回显组件模板功能
5 years ago
王杰
a6e9b90026
pom
5 years ago