 王杰
|
03d95e2591
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
b635c10750
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e66a560661
|
冲突
|
5 years ago |
|
王杰
|
4644639c2e
|
pom
|
5 years ago |
|
王杰
|
c06902f8de
|
冲突
|
5 years ago |
 曾贞一
|
462ed4f1de
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
|
曾贞一
|
7b3ef8f268
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
|
曾贞一
|
5af6f3ae7f
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
5 years ago |
 钮海涛
|
7cda94ab0c
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
0b354ef001
|
add import template
|
5 years ago |
|
王杰
|
096e2fc8bf
|
test merge ext-dev
|
5 years ago |
|
王杰
|
9b843e9496
|
sonar
|
5 years ago |
|
王杰
|
39ed206a06
|
sonar
|
5 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
2b89e35c69
|
pom
|
5 years ago |
|
王杰
|
78b5bb0c08
|
Merge branch 'test'
|
5 years ago |
|
王杰
|
bef695e533
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
7111a3b60f
|
pojo
|
5 years ago |
simon.song
|
ca8ca18f34
|
数据同步接口修改查询条件
|
5 years ago |
许心洁
|
1367584df0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
许心洁
|
cf83ab060d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 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
|
5 years ago |
|
simon.song
|
ff5348bf99
|
中航看板取值修改
|
5 years ago |
|
simon.song
|
9c51146117
|
数据迁移接口修改
|
5 years ago |
|
王杰
|
1431721afc
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
5a0927299b
|
新建表报错 bug
|
5 years ago |
|
simon.song
|
78a96c6583
|
mes管理端增加数据迁移功能相关接口
|
5 years ago |
|
许心洁
|
5fae039262
|
合并测服代码
|
5 years ago |
|
许心洁
|
55ba26ad22
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
许心洁
|
22c55fc8c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
joke.wang
|
e967dde7a3
|
总屏幕看板优化
|
5 years ago |
Dominic_Xiao
|
553fb09bc0
|
修改hql去除多余工厂代码条件
|
5 years ago |
|
许心洁
|
071b0ea9ce
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
# Conflicts:
# sonar-project.properties
|
5 years ago |
|
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
5 years ago |
|
simon.song
|
db0d184aa3
|
数据迁移功能完成。
|
5 years ago |
肖奕扬
|
9f0dfdb1fd
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
cf908f2d04
|
卡斯马基础界面--客户条码规则、产品容器容量配置
|
5 years ago |
puxiao.liao
|
696a0a8c3f
|
修复单据条码展开日期
|
5 years ago |
|
钮海涛
|
3b8a5482ad
|
add sanlux project
|
5 years ago |
|
王杰
|
25303ffc55
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
5a5874b137
|
test
|
5 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
5 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
5 years ago |
|
王杰
|
f1db936f42
|
pom
|
5 years ago |
|
王杰
|
d2f03a966e
|
Merge branch 'dev' into test
|
5 years ago |
|
joke.wang
|
5e1fac42fe
|
12112 设备周期作业计划需要与作业要求进行关联
|
5 years ago |
yumingxing
|
86a6fb1390
|
报表2021026
|
5 years ago |
|
钮海涛
|
8c4bf4b0fe
|
修复导入excel大数据问题
|
5 years ago |
|
肖奕扬
|
53401e1d19
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
ca50493d20
|
报表20210125
|
5 years ago |