wynne1005
|
286d605f09
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
陈思洁
|
f14f26a176
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
 曾贞一
|
5e2c592bbd
|
【IOT测试修改】
|
5 years ago |
|
曾贞一
|
1cf4943751
|
冲突解决
|
5 years ago |
|
曾贞一
|
70ff1763b8
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
|
5 years ago |
 王杰
|
ed411135b7
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0502f6d736
|
【任务：1529，料架分组队列展示组件】
|
5 years ago |
puxiao.liao
|
bf427bbb31
|
bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】
|
5 years ago |
|
puxiao.liao
|
e2a7bc43af
|
bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】
|
5 years ago |
|
陈思洁
|
35351607f8
|
【MES_半成品箱条码绑定】
|
5 years ago |
joke.wang
|
7a6e9b9e21
|
[任务：1479 料架打印]
|
5 years ago |
|
曾贞一
|
77d7ac18ad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
5 years ago |
|
wynne1005
|
2a619f69f8
|
将新pom提交到test
|
5 years ago |
|
陈思洁
|
c4032b8ed5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
320969f2f0
|
【1527 半成品标签自动打印】
|
5 years ago |
 钮海涛
|
d8779f42fb
|
从dev拉取最新代码
|
5 years ago |
廖普小
|
eb1c89e5e6
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
 贾文涛
|
abf5d3eeb9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
|
puxiao.liao
|
b626989e63
|
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/WmsEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
3a7d7a7924
|
bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】
|
5 years ago |
|
曾贞一
|
58053f4972
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
56c1bf8c44
|
【7648 在发运界面增加一个打开单据按钮。】
|
5 years ago |
|
钮海涛
|
cf0db5b8da
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
wynne1005
|
06551fdd66
|
还原pom
|
5 years ago |
|
wynne1005
|
e16b438764
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
a2914a4320
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
zcg
|
9ca3a819b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
9d5567f4a6
|
Merge branch 'test' into dev
|
5 years ago |
许心洁
|
a22d3d2333
|
动态查询：#任务1352(合并代码解决冲突)
|
5 years ago |
|
王杰
|
42943bdf24
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
030f2948fb
|
动态查询：#任务1352
|
5 years ago |
|
王杰
|
e3a9defdab
|
任务1528，生成并打印门锁标签
|
5 years ago |
|
zcg
|
98787953ec
|
【MesPcnEnum 枚举修改】
|
5 years ago |
|
wynne1005
|
f6b16b9828
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
6336ebd8e9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
8b750e6a76
|
修改生产数据类型
|
5 years ago |
|
puxiao.liao
|
8273a93520
|
Merge remote-tracking branch 'upstream/test' into test
|
5 years ago |
|
puxiao.liao
|
f2c41fc0a6
|
bug7800【7800 移库单导出时报错导出失败】
|
5 years ago |
|
王杰
|
1562431070
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0ca8502751
|
任务：1518
|
5 years ago |
袁津哲
|
01b685a4c8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
0c3d14a3f9
|
wms插件枚举新增按钮增强插件类型
|
5 years ago |
|
王杰
|
9ea4b61df4
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
f005489b61
|
ptl
|
5 years ago |
|
王杰
|
a9a7d78bd5
|
解决冲突
|
5 years ago |
|
joke.wang
|
9d55a2a8b3
|
[解决冲突1]
|
5 years ago |
|
joke.wang
|
8b681af622
|
[解决冲突]
|
5 years ago |