 王杰
|
649ffb548d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e30ba280e0
|
解决冲突
|
6 years ago |
|
王杰
|
bcf3866ca6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
5142191f55
|
解决冲突
|
6 years ago |
qianhs
|
1453a3d49b
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
|
王杰
|
ab34ebb769
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
3b235acda0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
31e24390dd
|
合并冲突
|
6 years ago |
WYnneaoapc
|
c93dd66cd9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7b88c605ba
|
枚举修改 1060
|
6 years ago |
|
陈思洁
|
99947f284e
|
枚举修改--移动业务类型
|
6 years ago |
|
qianhs
|
62bb71f4b0
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
许心洁
|
6d9787dc65
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lpx
|
94dc90172d
|
【扫描查询】bug6246
|
6 years ago |
张哲铭
|
578be0650a
|
Merge branch 'dev' into test
|
6 years ago |
wei.peng
|
43e400d354
|
数据映射类型 更改BigDecimal
|
6 years ago |
1111
|
db952282e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
7378df1b9e
|
【宁德问题清单】
|
6 years ago |
|
许心洁
|
b6e27c33c8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
jokelone
|
a04b8f7c57
|
【bug：5791 生产工单明细1】
|
6 years ago |
|
jokelone
|
5fd619ac79
|
【bug：5791生产工单明细】
|
6 years ago |
|
王杰
|
75e7aa30c2
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
84bf5ba64a
|
【需求：1162，pcn登陆】
|
6 years ago |
|
陈思洁
|
04e876250b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
58c9795b7c
|
移动类型、业务类型维护数据
|
6 years ago |
|
王杰
|
acaacf63a3
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
b4cea27a5b
|
代码审核 修改2
|
6 years ago |
|
WYnneaoapc
|
56e6cf7918
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
张哲铭
|
6871e96496
|
Merge branch 'dev' into test
|
6 years ago |
|
1111
|
88a69ac7f8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
71c867dd8c
|
【包装规格】
|
6 years ago |
|
许心洁
|
ac43296df3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5dc8ffb394
|
日志处理队列V1.0
|
6 years ago |
|
张哲铭
|
8e19f4dde3
|
Merge branch 'dev' into test
|
6 years ago |
 钮海涛
|
8e614bcb72
|
1:增加多选枚举的功能。
|
6 years ago |
|
钮海涛
|
6be9a55983
|
1:增加多选枚举的功能。
|
6 years ago |
|
钮海涛
|
f85dd4cbe5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
王杰
|
bc14fcf027
|
Merge branch 'dev' into test
|
6 years ago |
汪云昊
|
eeebbfd1fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
alwaysfrin
|
759f9ee819
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
e26dadca01
|
【需求：1162，pcn登陆】
|
6 years ago |
|
汪云昊
|
dcbb6a7a1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
053b3ae0e4
|
LAC 前端联调调整
|
6 years ago |
|
alwaysfrin
|
da582b871d
|
日志处理优化
|
6 years ago |
|
jokelone
|
755e920513
|
【bug：6250 返工返修拆解优化】
|
6 years ago |
|
张哲铭
|
efbe0dfce9
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
lpx
|
fc49ddeea5
|
【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】
|
6 years ago |
|
lpx
|
fc79b1b0f3
|
【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】
|
6 years ago |
|
王杰
|
aa2f514f6c
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
029c9b6bc8
|
代码审核 修改1
|
6 years ago |
|
王杰
|
980ae89cdf
|
【需求id：1162，pcn登陆】
|
6 years ago |
|
许心洁
|
970105ac19
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
b6d7156b0b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
9a6c5cfda3
|
【任务：1163客户订单】
|
6 years ago |
|
王杰
|
b2886012a5
|
【需求id：1162，pcn登陆】
|
6 years ago |
|
许心洁
|
e433915759
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
c68cb7889e
|
【VDA物料拆分-输入数量-数量检验】【6233】
|
6 years ago |
|
钮海涛
|
bd834a24cb
|
1:增加资源甘特图获取数据接口
|
6 years ago |
 曾贞一
|
c2d3e044fb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
be75c4ec42
|
【VDA质检--物料信息维护】任务号1135
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
|
6 years ago |
陆卫豪
|
64be0c721c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
4b47ceb42d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
3b447fa77a
|
数据抽取修改 1130
|
6 years ago |
|
jokelone
|
bdce8a7103
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
9418a0838b
|
【任务：1129 产品编码配置基础数据】
|
6 years ago |
|
许心洁
|
017cd18950
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
64cda23c12
|
1:增加资源甘特图获取数据接口
|
6 years ago |
|
曾贞一
|
d428aa302d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b7071bd0db
|
供应商字段 添加
|
6 years ago |
crish
|
87d9b5c6ec
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
1a7fda268b
|
andon 系统配置
|
6 years ago |
|
许心洁
|
9755e5f751
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
809e23aad7
|
1:修复启动时从数据库加载数据时的Bug。
|
6 years ago |
|
钮海涛
|
7aa078e7ce
|
1:修复未设置基准时间的Bug
|
6 years ago |
|
wei.peng
|
da7ba77dab
|
LAC 跨服务调用软适配接口完成
|
6 years ago |
|
陆卫豪
|
46fc5f5750
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
a6e8265e29
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jokelone
|
90ec0f107e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
32dbaed8fe
|
【任务：1129数据对象、对象结构、产品包装关系基础数据】
|
6 years ago |
|
WYnneaoapc
|
4308084ca3
|
数据抽取修改 1130
|
6 years ago |
|
王杰
|
d2c7a81893
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
d69e863959
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
3ef115bbe2
|
新增冗余字段
|
6 years ago |
|
汪云昊
|
23f0503454
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
1215a5c658
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
855cc46448
|
数据抽取修改 1116
|
6 years ago |
|
wei.peng
|
0ba20f0094
|
LAC 日志查询接口功能完成
|
6 years ago |
|
陆卫豪
|
07a80e7fd2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
46e0488d5a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
1de5b8b196
|
数据抽取修改 1116
|
6 years ago |
|
wei.peng
|
0d777d1894
|
LAC 日志处理功能完成
|
6 years ago |
|
crish
|
851ba63e7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
f111febd8d
|
修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法
|
6 years ago |
|
wei.peng
|
3645368544
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
b963bcb502
|
LAC 日志处理功能完成
|
6 years ago |
|
汪云昊
|
dd0de76d4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
219bf6db9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
457e10bc75
|
1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】
|
6 years ago |
|
许心洁
|
04453aa706
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
gaochangjiang
|
d0165fd342
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |