 王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
 钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
9a74188e55
|
master merge test
|
5 years ago |
qianhs
|
9461057a07
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
1d799ed294
|
2447 中航 扣减错误信息保存
|
5 years ago |
|
王杰
|
204da853c3
|
[任务：2442]
|
5 years ago |
joke.wang
|
8f7d6d46af
|
Fix Bug #9457
|
5 years ago |
|
joke.wang
|
54a51a4c69
|
Fix Bug #916
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |
|
王杰
|
d2ff83e22b
|
test merge dev
|
5 years ago |
|
王杰
|
411fdbaa7d
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
7533a3ef44
|
[任务2408]
|
5 years ago |
|
陈思洁
|
ffbf18944c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
f5b4c666bf
|
【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】
|
5 years ago |
 曾贞一
|
fd958c1c5f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
6dd0614533
|
【欧洲-定时悬挂链汇总更新库存数据JOB-优化】
|
5 years ago |
wynne1005
|
bd3e32d39e
|
小枪调试完毕
|
5 years ago |
宋军超
|
34a9cbe0ac
|
修改PTL数据同步逻辑
|
5 years ago |
|
宋军超
|
e4384bd569
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
2e5ab2cdcd
|
条码外上线添加赋值字段
|
5 years ago |
|
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
|
钮海涛
|
37a12c0cdf
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
puxiao.liao
|
5d62ebf26f
|
Finish Task #2424 Cost:8h
2424 07 1.2.3.7.1新增检查容器包装关系
|
5 years ago |
|
wynne1005
|
3f8789332f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
1252027685
|
dl小枪
|
5 years ago |
|
曾贞一
|
9bf2d5206c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
6750f11459
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |
|
曾贞一
|
791acf7ae8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
dffdf88471
|
【9556 欧洲-RFID条码操作记录-操作类型显示问题】
|
5 years ago |
|
joke.wang
|
b69fcdc0c6
|
Finish Task #2399 Cost:6h
|
5 years ago |
|
宋军超
|
885d2c16a1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
300e308394
|
新增盲检规则导入功能
|
5 years ago |
|
王杰
|
e1b3b14a36
|
test merge dev
|
5 years ago |
|
王杰
|
6de2bc5472
|
Merge branch 'test' into dev
|
5 years ago |
|
puxiao.liao
|
df125e71b9
|
泰国翻包
|
5 years ago |
|
qianhs
|
860f6d11f0
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
王杰
|
ec87065eb5
|
if pick data
|
5 years ago |
|
宋军超
|
448bd77b81
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
538b224f67
|
新增计划外条码识别上线-PCR功能
|
5 years ago |
|
wynne1005
|
cc4d17a81f
|
大枪ok bug 9492
|
5 years ago |
|
曾贞一
|
354d1290f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
f99c5232be
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |
|
宋军超
|
1c93d21815
|
修改字段BIN_NO
|
5 years ago |
|
曾贞一
|
da9c698ea4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
c0cf08fa19
|
【9556 欧洲-RFID条码操作记录-操作类型显示问题】
|
5 years ago |
|
王杰
|
7e48674d9e
|
dev merge test
|
5 years ago |
|
王杰
|
4260316f62
|
test merge dev
|
5 years ago |
|
joke.wang
|
e5cd6692d4
|
Finish Task #2359
|
5 years ago |
|
wynne1005
|
25382f0265
|
Fix Bug #2357,2358
|
5 years ago |
|
钮海涛
|
8d29e72322
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
dcc23e56cd
|
三力士演示demo
|
5 years ago |
|
曾贞一
|
ef58d72067
|
【9514 欧洲-定制业务-RFID管理-查询条件无效】
|
5 years ago |
|
puxiao.liao
|
9445989545
|
Finish Task #2338 Cost:4h
2338 07 1.2.3.5.1客户发往地新增维护目标存储区
|
5 years ago |
|
曾贞一
|
000097a4c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
82e2366fa6
|
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】
|
5 years ago |
|
钮海涛
|
20a5443fa7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
c05e18db5b
|
合并源分支代码
|
5 years ago |
|
joke.wang
|
52ad38fa9d
|
Finish Task #2238
|
5 years ago |
|
王杰
|
a2f047553f
|
pom
|
5 years ago |
|
王杰
|
c20f630402
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
dc91809bb7
|
test merge dev
|
5 years ago |
|
王杰
|
cff90316a5
|
ptl
|
5 years ago |
|
钮海涛
|
2bbc0bea66
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
1581e8b86c
|
三力士演示demo
|
5 years ago |
|
曾贞一
|
3620d2abd2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
e9492a86b0
|
【2315 07 1.2.3.6.3欧洲WMS-RFID查询】
|
5 years ago |
rock.yu
|
c4f8497dda
|
通用接口的字段映射关系 JSON 中增加 seq 属性，发出的接口报文会按照此属性生序
如果未配置此属性，则默认为 0，即无序
增加此段代码的单元测试用例
|
5 years ago |
|
钮海涛
|
f061ff7b73
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
c980c6c87c
|
三力士演示demo
|
5 years ago |
|
王杰
|
a452a71924
|
9461 北京海纳川-线边库拉动接口调整-0711
|
5 years ago |
|
宋军超
|
3d7b43a7de
|
修改测试天津问题bug
|
5 years ago |
|
陈思洁
|
4137fe1a80
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ba35d0a24b
|
【新增客户标签模板字段】
|
5 years ago |
|
曾贞一
|
5dfad71e39
|
【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
|
5 years ago |
许心洁
|
9a62fe0e06
|
BUG#9302
|
5 years ago |
|
qianhs
|
e321ca3790
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
8e99ae38e6
|
修改测试天津bug
|
5 years ago |
|
王杰
|
82158d8283
|
[bug 9238 9096]
|
5 years ago |
|
qianhs
|
f0b8cee974
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
ba6be25390
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
joke.wang
|
cdf8c79cce
|
Fix Bug #9408
|
5 years ago |
|
wynne1005
|
79fb42e149
|
MES_PROD_BIND_RECORD添加mdt索引
|
5 years ago |
|
宋军超
|
a49b57229c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
595266f536
|
Fix bug#9343
19125+条码打印页面后端传值新增一个字段值，传表wms_part 字段color +0709
|
5 years ago |
|
陈思洁
|
ce4593c381
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
47ef0fa503
|
【2286 07 1.1.2.2 强制放行ByPass】
|
5 years ago |
|
宋军超
|
bd251113a7
|
涂装展示组件添加显示实际包装数量
|
5 years ago |
汪云昊
|
c35cd9c169
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
曾贞一
|
8891c38e66
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
0108649a73
|
【代码优化-优化】
|
5 years ago |
|
宋军超
|
6440fd2dfe
|
首检、巡检报表新增工单号、产线和产品条码查询条件
|
5 years ago |
|
wynne1005
|
a84186e023
|
中航审核发布
|
5 years ago |
|
宋军超
|
716f0ac1f9
|
对象结构添加是否显示和显示顺序字段
|
5 years ago |
|
宋军超
|
93d7b4dac8
|
首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件
|
5 years ago |
|
宋军超
|
f032b6ddcd
|
首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件
|
5 years ago |
|
汪云昊
|
0fa8981440
|
定时任务日志bug修改及优化
资源内存清理方法
|
5 years ago |
|
曾贞一
|
c20159da6a
|
【上架策略-功能优化】
|
5 years ago |
|
钮海涛
|
6033695b99
|
修复合并版本问题
|
5 years ago |
|
puxiao.liao
|
f385be1d7c
|
无锡喜德BUG
|
5 years ago |
|
wynne1005
|
085f15427d
|
还原pom
|
5 years ago |