 王杰
|
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 |
 钮海涛
|
8ae3c65cb3
|
三力士演示demo
|
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 |
|
wynne1005
|
cb4bf9f453
|
merge andon pom
|
5 years ago |
|
wynne1005
|
dfa993b9e9
|
还原pom
|
5 years ago |
|
宋军超
|
b2587f2288
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
e5f3c553ec
|
bug 9122, 展示组件，配置产品位置参数，如果需要显示多个位置，使用逗号间隔。Fix Bug #9122
bug 9268, 工位BOM查询报错。Fix Bug #9268
bug 9270, 工位BOM查询报错。Fix Bug #9270
bug 9271, 工位BOM查询报错。Fix Bug #9271
所有展示组件添加工步区域缩进功能
|
5 years ago |
|
王杰
|
08cce22dbb
|
dev merge test
|
5 years ago |
|
王杰
|
02cb107672
|
Merge branch 'test' into dev
|
5 years ago |
|
曾贞一
|
639ac8f223
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
50e2f18c0d
|
【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】
|
5 years ago |
|
王杰
|
0e3614eb68
|
test merge dev
|
5 years ago |
|
wynne1005
|
15f0a37508
|
还原pom
|
5 years ago |
|
陈思洁
|
6bc9aa1f70
|
2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615
|
5 years ago |
|
汪云昊
|
39d6609a5f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
a2f7642d53
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
cbf1c97c06
|
彭伟代码恢复
定时任务日志过滤器
|
5 years ago |
|
王杰
|
9b56c6d9bf
|
【任务2223】
|
5 years ago |
|
陈思洁
|
556f112ef8
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
49f0c0c33a
|
2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615
|
5 years ago |
|
王杰
|
46261119d9
|
mes
|
5 years ago |
|
钮海涛
|
24474b4704
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
c3398a6cc9
|
修改中航BH问题
|
5 years ago |
|
joke.wang
|
4bb5dbfac5
|
Finish Task #2236 Cost:8h
|
5 years ago |
|
joke.wang
|
f8c6247137
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
44e3d667b3
|
订单池枚举
|
5 years ago |
袁津哲
|
257fb6c515
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
315e3a266f
|
优化涂装上线功能
|
5 years ago |
|
joke.wang
|
7457e27180
|
解决冲突
|
5 years ago |
|
joke.wang
|
12478a6251
|
解决冲突
|
5 years ago |
|
joke.wang
|
76e3fb0811
|
Finish Task #Finish Task #2236
|
5 years ago |
|
wynne1005
|
445668a9b2
|
调整jitseq字段类型
|
5 years ago |
|
wynne1005
|
1bc846454e
|
Merge branch 'test' into dev
|
5 years ago |
|
wynne1005
|
98849d3131
|
调整jitseq类型
|
5 years ago |
|
wynne1005
|
bcb4e5ad13
|
merge test
|
5 years ago |
|
wynne1005
|
31b5f3e234
|
merge dev 还原pom
|
5 years ago |
|
wynne1005
|
7b795c12fb
|
merge master
|
5 years ago |
|
qianhs
|
b48d38ee62
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
宋军超
|
2d39282521
|
修改涂装逻辑
|
5 years ago |
|
陈思洁
|
27ef6dc7f3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
7f4c173105
|
【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】
|
5 years ago |
|
joke.wang
|
ad6249f412
|
Finish Task #2235 Cost:8h
|
5 years ago |
|
wynne1005
|
b18408b3bb
|
merge test
|
5 years ago |
|
王杰
|
7517a11a90
|
[任务：2223]
|
5 years ago |
|
puxiao.liao
|
1f6c613488
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
f4edb471c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
3d826c5edc
|
【智能化开发-日志记录优化】
|
5 years ago |
|
puxiao.liao
|
1d2c2b7be2
|
海纳川智能化
|
5 years ago |
|
汪云昊
|
517eef8e66
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
0c0eea561d
|
功能优化
|
5 years ago |
|
joke.wang
|
ab0ae20d40
|
Finish Task #2234 客户JIT预装队列
|
5 years ago |
|
puxiao.liao
|
559fc003c8
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
|
宋军超
|
59c79b5134
|
TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h
|
5 years ago |
|
袁津哲
|
bdde5bbb9a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
c73ef2b93b
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
|
wynne1005
|
b8239f6455
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6956259496
|
EDI Finish Task #2215 Cost:48h Left:0h
|
5 years ago |
|
钮海涛
|
32eb9dc797
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
9dca27259e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
629817ddef
|
三力士数据排程
|
5 years ago |
|
joke.wang
|
57a7ddad35
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
fff94902f7
|
Fix Bug #9203
|
5 years ago |
|
puxiao.liao
|
37fb285aa9
|
海纳川智能化
|
5 years ago |
|
王杰
|
5ccf659c94
|
[bug:9149]
|
5 years ago |
|
wynne1005
|
614582ce36
|
条码表增加乐观锁
|
5 years ago |
|
曾贞一
|
7dddac5113
|
【智能化开发-锁定库位】
|
5 years ago |
|
wynne1005
|
aaf9f8a21b
|
添加乐观锁 日志
|
5 years ago |
|
wynne1005
|
1fb2f07ca3
|
edi 添加队列字段
|
5 years ago |
|
钮海涛
|
84698f3042
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
9475667e74
|
Finish Task #2134 Cost: 8h
|
5 years ago |
|
袁津哲
|
9361512fb8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
b1dddb62d3
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
|
王杰
|
473ebd5ec8
|
[任务：2219]
|
5 years ago |
|
王杰
|
31d7b71872
|
mes enum order type
|
5 years ago |
|
曾贞一
|
0d7eb7ac67
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
aa09a31957
|
【智能化开发-锁定库存】
|
5 years ago |
|
wynne1005
|
d2869dc31a
|
tmp
|
5 years ago |
|
joke.wang
|
aabd7b5d1d
|
Fix Bug #9112
|
5 years ago |
|
joke.wang
|
d44312c470
|
Fix Bug #9151
|
5 years ago |
|
许心洁
|
54241ebf11
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
9d79ed5376
|
3D仓库规则引擎优化
|
5 years ago |
|
袁津哲
|
56a4edc4c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
295860683a
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
|
王杰
|
472b2f1ee6
|
bug 9149
|
5 years ago |
|
许心洁
|
38b154b0cb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
6cd70eb695
|
3D仓库规则引擎优化
|
5 years ago |
|
钮海涛
|
0626d6f969
|
修复版本问题
|
5 years ago |
|
钮海涛
|
e42ea19f37
|
修复版本问题
|
5 years ago |
|
钮海涛
|
8d4c5f3cd4
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
272d647073
|
【任务2219】
|
5 years ago |
|
钮海涛
|
2478fc3b14
|
修复版本问题
|
5 years ago |
|
钮海涛
|
0f2f56163e
|
Merge branch 'master' into test
|
5 years ago |
|
puxiao.liao
|
5269cfb732
|
BH 需求修改
|
5 years ago |
|
wynne1005
|
d9f619e1a0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
e599a833f1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3b5142a1f8
|
edi
|
5 years ago |
|
宋军超
|
6f454c95a4
|
Start Task #2212,2205 Cost:8h Left:16h
|
5 years ago |
|
宋军超
|
c44e6ac965
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
e3a86fdbab
|
涂装条码打印、涂装上线功能联调
|
5 years ago |
|
钮海涛
|
2b5f76caee
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
钮海涛
|
62c9d8d27d
|
修复欧洲FIFO跳过未进行交易处理Bug
|
5 years ago |
|
joke.wang
|
cf1020d82f
|
删除@Lob
|
5 years ago |
|
王杰
|
08fe2de018
|
mes
|
5 years ago |
|
joke.wang
|
2829bb5afb
|
pcn同步对象映射
|
5 years ago |
|
wynne1005
|
8ae7ce53b7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
a757d2c339
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
84253d7562
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
b9ac27df19
|
无锡喜德BUG
|
5 years ago |
|
joke.wang
|
2ce2e20c0b
|
包装扫描数量计算有误修复
|
5 years ago |
|
袁津哲
|
f607860c57
|
Fix Bug #8845
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
|
5 years ago |
|
袁津哲
|
aaaa591be4
|
优化关键条码绑定逻辑
|
5 years ago |
|
曾贞一
|
3d79d73ff4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
624e8d6461
|
【2193 06 1.2.3.7.4任务自动生成任务JOB】
|
5 years ago |
|
曾贞一
|
b68f55b062
|
【2193 06 1.2.3.7.4任务自动生成任务JOB】
|
5 years ago |
|
wynne1005
|
cf1edee02e
|
edi
|
5 years ago |
|
王杰
|
15e7f2a0b5
|
pom
|
5 years ago |
|
王杰
|
ea5a069eeb
|
pom
|
5 years ago |
|
王杰
|
ed64d12875
|
pojo
|
5 years ago |
|
宋军超
|
712f1e8d3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
5be9081fc3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
f464fd09c5
|
Merge branch 'test' into dev
|
5 years ago |
|
宋军超
|
9218ca44a7
|
产品条码表添加生产批次lotNo
|
5 years ago |
|
joke.wang
|
b32136f75d
|
Fix Bug #9078
|
5 years ago |
|
puxiao.liao
|
fa383f6417
|
自动化策略主表
|
5 years ago |
|
王杰
|
f3ffdc7d4c
|
dev merge test
|
5 years ago |
|
puxiao.liao
|
84dbbcd9a8
|
自动化策略主表
|
5 years ago |
|
puxiao.liao
|
2673b9164a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
2c16efcb72
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
7d5d36d084
|
test merge master
|
5 years ago |
|
puxiao.liao
|
aea28cf6bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
e3513bddaa
|
自动化策略主表
|
5 years ago |
|
王杰
|
70d58be136
|
pom
|
5 years ago |
|
王杰
|
1e1f7cc1fb
|
pom
|
5 years ago |
|
王杰
|
91d0ec1671
|
Merge branch 'master' into test
|
5 years ago |
|
曾贞一
|
710c6aee3a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
913991d30d
|
【2193 06 1.2.3.7.4任务自动生成任务JOB】
|
5 years ago |
|
袁津哲
|
3247ef5ed7
|
优化涂装上线工位展示组件逻辑
|
5 years ago |
|
宋军超
|
fe05a76f6f
|
添加涂装功能实体字段与model
|
5 years ago |
|
qianhs
|
20cefbfec6
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
袁津哲
|
66b98dd6d5
|
1.开发涂装上线功能逻辑
2.开发涂装工单条码打印逻辑
|
5 years ago |
|
钮海涛
|
6c6fbf7e2c
|
新增收货回执显示收货时间功能
|
5 years ago |
|
陈思洁
|
3f88a390e4
|
【8983 需求调整-泰国MES，工单下达逻辑调整】
|
5 years ago |
|
宋军超
|
68fa329701
|
添加涂装打印实体
|
5 years ago |
|
陈思洁
|
5431d09073
|
【8983 需求调整-泰国MES，工单下达逻辑调整】
|
5 years ago |
|
wynne1005
|
c8178975af
|
StationRequestBean添加状态机代码
|
5 years ago |
|
钮海涛
|
44ba68bb04
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
d08465dd38
|
修复版本问题
|
5 years ago |
|
陈思洁
|
80e0ec63bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
498d6821a1
|
【2145 06 1.2.4.6.1.1 注塑计划排产】
|
5 years ago |
|
钮海涛
|
800a954b7f
|
Merge branch 'test' into dev
|
5 years ago |
|
qianhs
|
98b0110ff3
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
王杰
|
c2a6fb1684
|
[任务2186 涂装导入]
|
5 years ago |
|
陈思洁
|
1f6af14316
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
0d81228ce7
|
【2145 06 1.2.4.6.1.1 注塑计划排产】
|
5 years ago |
|
joke.wang
|
1f05cfca4c
|
Finish Task #2152 Cost:16h
|
5 years ago |
|
puxiao.liao
|
9cd0823c34
|
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 |
|
曾贞一
|
9567d62195
|
【自动化策略】
|
5 years ago |
|
puxiao.liao
|
17d3642fff
|
自动化策略主表
|
5 years ago |
|
曾贞一
|
a8b2a0a618
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
e94e4ad189
|
【2180 06 1.2.3.8泰国WMS－生产报工接口】
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS－生产报工接口】
|
5 years ago |
|
袁津哲
|
a4820f236e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3d88913343
|
物料表中新增标准包规数量字段
|
5 years ago |
|
汪云昊
|
6d71c01178
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
26b564f0be
|
FTP 文件编码类型
|
5 years ago |
|
汪云昊
|
517f89ad58
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
6c5c726187
|
REST 服务端适配器支持JSON与XML
FTP 支持增量写入
国际化资源内存缓存
|
5 years ago |
|
陈思洁
|
9e9bb2fd03
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
f90371f632
|
【2144 06 1.2.4.6.1.3 装配计划排产】
|
5 years ago |
|
puxiao.liao
|
ffc2d4d56c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
|
5 years ago |
|
puxiao.liao
|
49f9d06d5f
|
Fix bug#9062
无锡喜德-生产汇报（原材料/成品）用 函数取出来的父位置和子位置号可能会有多个-0620
|
5 years ago |
|
钮海涛
|
ac7e69e51e
|
修复版本问题
|
5 years ago |
|
钮海涛
|
34e63db56c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
e340749f87
|
Finish Task #2196 Cost:4h
|
5 years ago |
|
puxiao.liao
|
eeaaa74d1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
0818778346
|
自动化策略主表
|
5 years ago |
|
宋军超
|
819bd7aba8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
8cf6e99cf6
|
mes
|
5 years ago |
|
宋军超
|
87dc9ab966
|
与前端联调修改
|
5 years ago |
|
曾贞一
|
16271ea338
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
68c3f087dc
|
【2180 06 1.2.3.8泰国WMS－生产报工接口】
|
5 years ago |
|
曾贞一
|
77e6ee3b98
|
【2180 06 1.2.3.8泰国WMS－生产报工接口】
|
5 years ago |
|
宋军超
|
2ef42fdadd
|
Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h
|
5 years ago |
|
钮海涛
|
9d64793a5f
|
Merge branch 'master' into test
|
5 years ago |
|
joke.wang
|
3dda15e00a
|
Finish Task #2153 Cost:24h
|
5 years ago |
|
袁津哲
|
edae2b00f6
|
Fix Bug #8996,#9033
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
|
5 years ago |
|
puxiao.liao
|
0c0d43cd96
|
北京海纳川：采购入库组件
|
5 years ago |
|
wynne1005
|
64b00d6717
|
接口表添加产品条码
|
5 years ago |
|
汪云昊
|
3c2462c1af
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
fdd5516a0f
|
FTP适配器优化
表单功能优化
UA 适配 LONG类型
|
5 years ago |
|
陈思洁
|
b65d9e0f3d
|
2171 首检生成逻辑调整
|
5 years ago |
|
wynne1005
|
b0df686091
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
wynne1005
|
878acb869f
|
提交zh修改问题
|
5 years ago |
|
袁津哲
|
c066820b18
|
Fix Bug #9001
关键件绑定异常问题
|
5 years ago |
|
曾贞一
|
a4fd88f237
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
a59fa1bf9b
|
【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】
|
5 years ago |
|
袁津哲
|
cb69f62c63
|
Fix Bug #8886
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
|
5 years ago |
wei.peng
|
b0e752c65e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wei.peng
|
91f4edc83f
|
数据库读写分离 功能完善
|
5 years ago |
|
wei.peng
|
d5051cabdb
|
数据库读写分离 功能完善
|
5 years ago |
|
wei.peng
|
25b2109144
|
getByProperty 查询优化
|
5 years ago |
|
王杰
|
0388c36c41
|
mes
|
5 years ago |
|
wei.peng
|
fb65b042f0
|
getByProperty 查询优化
|
5 years ago |
|
袁津哲
|
212dccad6c
|
同前端联调倒计时组件逻辑
|
5 years ago |
|
wei.peng
|
ec3febfaa9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
67a7904024
|
【泰国演示问题修复】
|
5 years ago |
|
曾贞一
|
26e3053ecc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
99f1ba98b6
|
【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】
|
5 years ago |
|
汪云昊
|
676ab32cd6
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
0ea80a0f63
|
删除无用代码
测试环境开关回滚
|
5 years ago |
|
袁津哲
|
2546395b8d
|
优化定时倒计时组件逻辑和前后端调用逻辑
|
5 years ago |
|
wei.peng
|
4208d39e3f
|
feat(密码规则验证完成): 用户登录,密码修改
|
5 years ago |
|
wei.peng
|
bdb5e6e27c
|
密码策略完成
|
5 years ago |
|
袁津哲
|
089f655cfe
|
优化工位定时组件调用逻辑
|
5 years ago |
|
袁津哲
|
638c032d95
|
优化工位定时组件调用逻辑
|
5 years ago |
|
wynne1005
|
8ff96a0c3f
|
merge master 防止冲突更多
|
5 years ago |
|
puxiao.liao
|
3fe454da39
|
Fix bug#8909
|
5 years ago |
|
joke.wang
|
ab8ee21c66
|
Finish Task #2139 Cost:8h
|
5 years ago |
|
钮海涛
|
e457b50145
|
中航需求变更
|
5 years ago |
|
袁津哲
|
b114daed3f
|
优化代码
|
5 years ago |
|
汪云昊
|
2888e5b510
|
错误注解
|
5 years ago |
|
汪云昊
|
4ec71681de
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
4de301bf79
|
MDM 系统结构优化
单元测试开关
|
5 years ago |
|
王杰
|
6c47817bfe
|
mes enuk
|
5 years ago |
|
joke.wang
|
6f375edf9a
|
类型信息枚举增加样本类型
|
5 years ago |
|
joke.wang
|
26d7701a49
|
包装扫描需求变更
|
5 years ago |
|
陈思洁
|
3924be2504
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
e7e13e53f4
|
【工艺流程设计-更新前端组件】
|
5 years ago |
|
qianhs
|
53298f6b88
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
曾贞一
|
5c2dcf8e10
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
f3857116d1
|
【2074 06 1.2.3.8上架策略-计算COI值】
|
5 years ago |
|
joke.wang
|
f5452667f6
|
Start Task #2139 Cost:16h Left:8h
|
5 years ago |
|
joke.wang
|
672483245c
|
Fix #Bug 8904
|
5 years ago |
|
袁津哲
|
764060bf20
|
Start Task #2118 Cost:8h Left:0h
Finish Task #2118 Cost:8h
|
5 years ago |
|
qianhs
|
7a60d37ddc
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
曾贞一
|
27cb1dddfe
|
【1603 委外扣减查询-需求变更】
|
5 years ago |
|
袁津哲
|
5ee4fd6441
|
开发MES产线AGV停机记录报表功能
|
5 years ago |
|
钮海涛
|
aeb347b1fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
ce020cc1ab
|
Start Task #2134 Cost: 8h
|
5 years ago |
|
wynne1005
|
de08f2005e
|
还原hqlpack
|
5 years ago |
|
joke.wang
|
cb4fd979e1
|
包装字段修改
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
|
wynne1005
|
ba1ba8bc0f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
8623a5a13d
|
还原pom
|
5 years ago |
|
wynne1005
|
b75347ffc1
|
还原pom
|
5 years ago |
|
wynne1005
|
d969c07317
|
解决冲突
|
5 years ago |
|
wynne1005
|
4eef0f8c45
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
c9114c9dae
|
Fix Bug #8688
|
5 years ago |
|
王杰
|
a495d0b4ce
|
物料校验项]
|
5 years ago |
|
钮海涛
|
9f349cd42c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
9dd7c54678
|
修复启动问题
|
5 years ago |
|
宋军超
|
247589fc0d
|
Fix Bug #8884
|
5 years ago |
|
袁津哲
|
adb974d874
|
合并test分支代码到dev分支
|
5 years ago |
|
wynne1005
|
40d921ddd6
|
优化 新增状态点类型，发运自测1
|
5 years ago |
|
袁津哲
|
142033f1ac
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
袁津哲
|
0504e58f95
|
Fix Bug #8778
|
5 years ago |
|
puxiao.liao
|
328967ff06
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
2194715705
|
Fix bug#8736
|
5 years ago |
|
qianhs
|
f4ca720ce4
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
王杰
|
1d775acd69
|
ptl IF_拣货数据
|
5 years ago |
|
joke.wang
|
28fe4a03f8
|
Finish Task#2108 Cost:12h
|
5 years ago |
|
puxiao.liao
|
2b791901d2
|
Fix bug#8876
|
5 years ago |
|
王杰
|
e063608cb1
|
ptl IF_拣货数据
|
5 years ago |
|
王杰
|
be9f9e843d
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
9675274a0d
|
ptl
|
5 years ago |
|
钮海涛
|
93dd90363e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
ae805a6596
|
修复Bug
|
5 years ago |
|
钮海涛
|
16574b6920
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
da454b3921
|
领料单界面显示erp单号问题
|
5 years ago |
|
袁津哲
|
42f43c58f5
|
Fix Bug #8778
|
5 years ago |
|
袁津哲
|
32ddc567a0
|
Start Task #2021 Cost:24h Left:0h
Finish Task #2021 Cost:24h
|
5 years ago |
|
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
袁津哲
|
a871d65e1f
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
袁津哲
|
0a5f45840a
|
Fix Bug #8778
|
5 years ago |
|
宋军超
|
d18beff50c
|
Finish Task #2094 Cost:16h
|
5 years ago |
|
钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
qianhs
|
057439d050
|
Finish Task #2080 Cost:8h
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
|
5 years ago |
|
puxiao.liao
|
3173e43245
|
Fix bug#8742
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
8ec9f1b137
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
471208d051
|
SWEB添加条码状态枚举
|
5 years ago |
|
王杰
|
c39c9b6f70
|
ptl
|
5 years ago |
|
袁津哲
|
12457efe93
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
袁津哲
|
fb4bf4cbe2
|
Fix Bug #8778
|
5 years ago |