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 |