joke.wang
|
bddd4b37a2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
52b2ea43da
|
14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值
|
4 years ago |
陈思洁
|
2b2761ade2
|
【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】
|
4 years ago |
|
joke.wang
|
ca8bfd3f53
|
泰国扭矩采集
|
4 years ago |
Dominic_Xiao
|
f12c568119
|
天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值
|
4 years ago |
|
Dominic_Xiao
|
cc86a60ba7
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
9eba8f1683
|
天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段
|
4 years ago |
|
joke.wang
|
072bc431fb
|
扭矩采集
|
4 years ago |
simon.song
|
3c6a7b410d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
5554bfd14c
|
14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17
|
4 years ago |
 王杰
|
38d03b1060
|
状态机优化
|
4 years ago |
|
陈思洁
|
9e0d03629c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
281957a6f5
|
【3324 泰国-扭矩采集 --PC端后端】
|
4 years ago |
|
joke.wang
|
3d0d39ac1d
|
Tha扭矩采集
|
4 years ago |
|
陈思洁
|
ccf221f80b
|
【pojo改名字】
|
4 years ago |
|
陈思洁
|
39ced0a83d
|
【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】
|
4 years ago |
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
|
joke.wang
|
7f8dd50412
|
物料关系表
|
4 years ago |
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
4 years ago |
|
Dominic_Xiao
|
e58ffc9d69
|
天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段
|
4 years ago |
|
Dominic_Xiao
|
ce91ea879f
|
天津-PCN新增功能:物料校验客户标签
|
4 years ago |
|
simon.song
|
f73570b28e
|
漏提交代码
|
4 years ago |
|
Dominic_Xiao
|
d129a3863b
|
天津-新注塑区域集中下件
|
4 years ago |
|
joke.wang
|
cd5773fb2e
|
绑定关键件增加显示列
|
4 years ago |
|
王杰
|
f8e0146b19
|
pom
|
4 years ago |
|
王杰
|
af11605d46
|
工步
|
4 years ago |
|
wynne1005
|
8b1e28c893
|
删除mongo依赖 merge test
|
4 years ago |
|
joke.wang
|
19872ba443
|
隔离报废
|
4 years ago |
|
陈思洁
|
c2dbff5d5a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
6b4ae7eb71
|
【3254 泰国-上装总成套膜标签打印】
|
4 years ago |
|
joke.wang
|
0c4e6359fc
|
JISA导入优化
|
4 years ago |
|
joke.wang
|
fbab36aad2
|
报废隔离
|
4 years ago |
|
joke.wang
|
24aa100dfe
|
追溯总览报表
|
4 years ago |
|
陈思洁
|
efebc6f605
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
154307b2f0
|
【泰国工位传参修改】
|
4 years ago |
许心洁
|
2127e3d260
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
joke.wang
|
339cbf0634
|
bug:14146 一张报表中查询产品所有追溯信息
|
4 years ago |
|
Dominic_Xiao
|
44af0f4e80
|
删除重复实体类
|
4 years ago |
|
joke.wang
|
d7da6437b3
|
获取状态机dao bug修复
|
4 years ago |
|
王杰
|
4d81424794
|
numberrule
|
4 years ago |
|
王杰
|
5e290e81b8
|
number rule
|
4 years ago |
|
simon.song
|
dbeb6baac7
|
14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28
|
4 years ago |
|
joke.wang
|
f01ae5106b
|
14165 返修队列增加校验
|
4 years ago |
|
许心洁
|
38e6870f04
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
王杰
|
431ee97d64
|
同步工单表
|
4 years ago |
|
王杰
|
fe6940b0dc
|
编码规则扩展
|
4 years ago |
|
joke.wang
|
b505fe8456
|
13858 20027--接口表同步情况报表
|
4 years ago |
|
joke.wang
|
e2a9222b47
|
pcn登陆限制
|
4 years ago |
|
Dominic_Xiao
|
0c9dff6dd8
|
不良品处理根据物料类型查询位置
|
4 years ago |
|
Dominic_Xiao
|
c1eb51dec5
|
缺陷位置新增产品类型字段
|
4 years ago |
|
王杰
|
03d95e2591
|
Merge branch 'dev' into test
|
4 years ago |
|
王杰
|
e66a560661
|
冲突
|
4 years ago |
|
王杰
|
ec3d2f8557
|
pom
|
4 years ago |
|
王杰
|
4644639c2e
|
pom
|
4 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
4 years ago |
|
王杰
|
2b89e35c69
|
pom
|
4 years ago |
|
王杰
|
78b5bb0c08
|
Merge branch 'test'
|
4 years ago |
|
simon.song
|
ca8ca18f34
|
数据同步接口修改查询条件
|
4 years ago |
|
许心洁
|
cf83ab060d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
simon.song
|
24bd5ab668
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
4 years ago |
|
simon.song
|
ff5348bf99
|
中航看板取值修改
|
4 years ago |
|
simon.song
|
9c51146117
|
数据迁移接口修改
|
4 years ago |
|
王杰
|
5a0927299b
|
新建表报错 bug
|
4 years ago |
|
simon.song
|
78a96c6583
|
mes管理端增加数据迁移功能相关接口
|
4 years ago |
|
许心洁
|
22c55fc8c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
joke.wang
|
e967dde7a3
|
总屏幕看板优化
|
4 years ago |
|
Dominic_Xiao
|
553fb09bc0
|
修改hql去除多余工厂代码条件
|
4 years ago |
|
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
4 years ago |
|
simon.song
|
db0d184aa3
|
数据迁移功能完成。
|
4 years ago |
肖奕扬
|
9f0dfdb1fd
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
cf908f2d04
|
卡斯马基础界面--客户条码规则、产品容器容量配置
|
4 years ago |
|
王杰
|
25303ffc55
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
4 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
王杰
|
d2f03a966e
|
Merge branch 'dev' into test
|
4 years ago |
|
joke.wang
|
5e1fac42fe
|
12112 设备周期作业计划需要与作业要求进行关联
|
4 years ago |
yumingxing
|
86a6fb1390
|
报表2021026
|
4 years ago |
|
yumingxing
|
ca50493d20
|
报表20210125
|
4 years ago |
|
joke.wang
|
378993b225
|
包装条码补打优化
|
4 years ago |
|
陈思洁
|
85ebb5ce78
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
01877b80d5
|
【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】
|
4 years ago |
|
Dominic_Xiao
|
81e63fe7d2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
c5d56b2c32
|
炉内位置信息新增方向字段
|
4 years ago |
|
joke.wang
|
5d25ecc9b5
|
13829 mgn-bj 补打页面优化
|
4 years ago |
|
王杰
|
fba7f636d9
|
状态机
|
4 years ago |
|
王杰
|
1e6691c8b5
|
Merge branch 'test' into dev
|
4 years ago |
|
joke.wang
|
e779b5e482
|
成品标签打印修改
|
4 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
4 years ago |
|
陈思洁
|
d8aac51ef5
|
【排序序号--滑道】
|
4 years ago |
|
陈思洁
|
3997ae3e93
|
【排序序号--滑道】
|
4 years ago |
|
yumingxing
|
70b4bc75e8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
yumingxing
|
428f98955d
|
报表20210118
|
4 years ago |
|
许心洁
|
8246a28c05
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
Dominic_Xiao
|
db204080a8
|
滑道工厂新增"客户代号"与"客户抬头"字段
|
4 years ago |
|
yumingxing
|
0871833d26
|
报表20210115
|
4 years ago |
|
yumingxing
|
479b81cb08
|
报表20210114
|
4 years ago |
|
yumingxing
|
b1df64bff5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
yumingxing
|
53b72a8f8d
|
报表202101141821
|
4 years ago |