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 |
汪云昊
|
c6031a0fc4
|
feat(softswitch):添加sap-rfc适配器
|
4 years ago |
wynne1005
|
6adc396aef
|
删除动态表单的元素样式类型
|
4 years ago |
|
wynne1005
|
dce748fdd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
2a63c05597
|
删除动态表单的元素样式类型
|
4 years ago |
|
wynne1005
|
4d40686be8
|
删除动态表单的元素样式类型
|
4 years ago |
 曾贞一
|
54e691bc30
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
2e49522aec
|
【14115 20063-BH基础数据增加导出及导入功能-20210305】
|
4 years ago |
|
joke.wang
|
24aa100dfe
|
追溯总览报表
|
4 years ago |
|
wynne1005
|
1f94eee641
|
Merge branch 'dev' into test
|
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 |
puxiao.liao
|
5b3046f482
|
天津麦格纳BUG修复
|
4 years ago |
|
joke.wang
|
d7da6437b3
|
获取状态机dao bug修复
|
4 years ago |
 王杰
|
4d81424794
|
numberrule
|
4 years ago |
|
王杰
|
5e290e81b8
|
number rule
|
4 years ago |
|
wynne1005
|
8c3a652ada
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
6318ca6afc
|
feat(form): 动态表单新增跳转详情页枚举
|
4 years ago |
simon.song
|
dbeb6baac7
|
14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28
|
4 years ago |
|
joke.wang
|
f01ae5106b
|
14165 返修队列增加校验
|
4 years ago |
|
许心洁
|
d223ff242d
|
BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失
|
4 years ago |
|
王杰
|
04756b1a6d
|
Merge branch 'test' into dev
|
4 years ago |
|
许心洁
|
38e6870f04
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
王杰
|
431ee97d64
|
同步工单表
|
4 years ago |
|
王杰
|
94d38bb175
|
test merge dev
|
4 years ago |
|
王杰
|
fe6940b0dc
|
编码规则扩展
|
4 years ago |
|
joke.wang
|
b505fe8456
|
13858 20027--接口表同步情况报表
|
4 years ago |
|
joke.wang
|
e2a9222b47
|
pcn登陆限制
|
4 years ago |
|
puxiao.liao
|
485fe13202
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
c880d51c9d
|
修复泰国翻包
|
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 |
|
王杰
|
c06902f8de
|
冲突
|
4 years ago |
|
曾贞一
|
462ed4f1de
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
4 years ago |
|
曾贞一
|
7b3ef8f268
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
4 years ago |
|
曾贞一
|
5af6f3ae7f
|
【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】
|
4 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
4 years ago |
|
王杰
|
2b89e35c69
|
pom
|
4 years ago |
|
王杰
|
78b5bb0c08
|
Merge branch 'test'
|
4 years ago |
|
王杰
|
7111a3b60f
|
pojo
|
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 |
|
许心洁
|
5fae039262
|
合并测服代码
|
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 |
|
puxiao.liao
|
696a0a8c3f
|
修复单据条码展开日期
|
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 |
|
puxiao.liao
|
c8d97daa58
|
Fix bug#13248
|
4 years ago |
|
puxiao.liao
|
983565aca1
|
Fix bug#13752
|
4 years ago |
|
joke.wang
|
378993b225
|
包装条码补打优化
|
4 years ago |
|
王杰
|
0183ca2a05
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
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 |
|
wynne1005
|
665a89a8ae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
5b2f57450b
|
feat(core): 松下GID单点登录需求
支持E9方式的SSo
|
4 years ago |
|
joke.wang
|
5d25ecc9b5
|
13829 mgn-bj 补打页面优化
|
4 years ago |
 钮海涛
|
fe0a83a8fe
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
1bc4c491b6
|
修改导入功能
|
4 years ago |
|
王杰
|
fba7f636d9
|
状态机
|
4 years ago |
|
王杰
|
1e6691c8b5
|
Merge branch 'test' into dev
|
4 years ago |
|
joke.wang
|
e779b5e482
|
成品标签打印修改
|
4 years ago |
|
joke.wang
|
acaeb348e1
|
标签基础页面
|
4 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
4 years ago |
|
王杰
|
1a0e581921
|
Merge branch 'dev' into test
|
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
|
a8fafb2443
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
db204080a8
|
滑道工厂新增"客户代号"与"客户抬头"字段
|
4 years ago |
|
许心洁
|
8cd32346d3
|
BUG#13694,喜德BUG：单据条码展开没有查询seqNo导致无法生成条码
|
4 years ago |
|
许心洁
|
c45cd70ea9
|
喜德BUG：单据展开查询没有返回seqNo导致不能生成条码
|
4 years ago |
|
puxiao.liao
|
7333a8f762
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
puxiao.liao
|
8eb1831861
|
Fix bug#12607
|
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 |
|
王杰
|
fb4b10e689
|
涂装质检 待定 重构
|
4 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
|
陈思洁
|
74947bfaf8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
abe5ae9f9b
|
【13524 20027--首、巡、末检的检验项内容需要增加排序字段，现首巡末检的检验项是没排序的，需要按照新增的排序字段进行排序】
|
4 years ago |
|
yumingxing
|
fcbf1467b2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
yumingxing
|
deedd2f2ef
|
报表20210114
|
4 years ago |
|
joke.wang
|
0a389480f3
|
13696 新增不良维修记录报表
|
4 years ago |
|
wynne1005
|
d9029eb690
|
BlockForm 添加table-formatter字段
|
4 years ago |
|
wynne1005
|
6f49603fee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
Dominic_Xiao
|
2679582bc3
|
中航新增关闭开线检测功能
|
4 years ago |
|
肖奕扬
|
0d7c71d5db
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
bfd5b0ab9d
|
新增滑道工厂基础模块
|
4 years ago |
|
yumingxing
|
9202937516
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
yumingxing
|
2cd3547637
|
报表优化
|
4 years ago |
|
joke.wang
|
d93c9fe6a6
|
物料表增加冗余字段
|
4 years ago |
|
许心洁
|
ca5cc4937e
|
需求#1391
|
4 years ago |
rock.yu
|
8be0df57ea
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
rock.yu
|
ad2c771996
|
ERP快照相关的表切换为从BaseBean继承，解决SnapID重复的问题
|
4 years ago |
 廖湘明
|
af3eeec75b
|
限制最大查询条数，零件号改成客户零件号
|
4 years ago |
|
廖湘明
|
d6ed0a40a1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
廖湘明
|
d721b2845f
|
限制最大查询条数，零件号改成客户零件号
|
4 years ago |
|
puxiao.liao
|
692782178e
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
puxiao.liao
|
1f3f891264
|
二维码优化
|
4 years ago |
|
廖湘明
|
b2459ba8ec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
廖湘明
|
abca1558da
|
零件号属性换成客户零件号
|
4 years ago |
|
陈思洁
|
c475abc39d
|
【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】
|
4 years ago |
|
陈思洁
|
32fe7ffac7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
193c4a254c
|
【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】
|
4 years ago |
|
joke.wang
|
1ed47f1526
|
工单条码补打查询优化
|
4 years ago |
|
许心洁
|
6fab12fc50
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
e72c2dd09a
|
任务#2586
|
4 years ago |
|
yumingxing
|
ca708c3f2d
|
需求变更报表修改
|
4 years ago |
|
puxiao.liao
|
b379826423
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
puxiao.liao
|
d486da1120
|
增加二维码生成功能
|
4 years ago |
|
陈思洁
|
90bfcd6d46
|
【Bi 界面bug修复】
|
4 years ago |
|
陈思洁
|
72cb3a0cd5
|
【Bi 界面bug修复】
|
4 years ago |
|
王杰
|
7f6281f63e
|
报工数据查询报表
|
4 years ago |
|
钮海涛
|
76cf0be79d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
7d8fd15370
|
修复坤泰问题
|
4 years ago |
|
陈思洁
|
a7882ffdb9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
10ae503952
|
【泰国需求变更】
|
4 years ago |
|
汪云昊
|
b03d4bf573
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
王杰
|
45a7ff6132
|
天津组装看板
|
4 years ago |
duan.yang
|
752146bc27
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
duan.yang
|
63fc619c74
|
同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
汪云昊
|
1ea73e877f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
cb9add43a3
|
feat(sms):短信模型，枚举调整
|
4 years ago |
|
肖奕扬
|
4565693c67
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
4 years ago |
|
yumingxing
|
1871c738e3
|
报表BUG
|
4 years ago |
|
肖奕扬
|
90d12235cf
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
廖湘明
|
08c9f486c4
|
日期条件验证
|
4 years ago |
|
duan.yang
|
c2eac0f71c
|
同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
simon.song
|
33f0e4b381
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
6532ac13b6
|
中航新增读取第三方DB工步
|
4 years ago |
|
肖奕扬
|
6fc51c20f2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
廖湘明
|
87c2c3b156
|
翻译枚举
|
4 years ago |
shun
|
b7f3b931a0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
9cdf5827a3
|
JIS发运报表增加导出枚举
|
4 years ago |
|
钮海涛
|
2740830e8f
|
合并test代码
|
4 years ago |
|
simon.song
|
d824e42085
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
6f0a831d20
|
中航看板优化
|
4 years ago |
|
simon.song
|
9c1bd71675
|
中航产线看板：过程检验优化
|
4 years ago |
|
shun
|
dfaa9c810b
|
JIS发运报表增加导出model
|
4 years ago |
|
陈思洁
|
5d79dd413a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
6f5204d536
|
【13526 20027--产线管控中增加一个开线检测按钮用于临时开线-2020-12-30】
|
4 years ago |
|
Dominic_Xiao
|
c72a294a6f
|
回滚POM
|
4 years ago |
|
肖奕扬
|
9f25d80eac
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
1efcd63ca5
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
6d3fa2aa50
|
物料上炉模式新增方向字段
|
4 years ago |
|
puxiao.liao
|
66671bafb8
|
Fix bug#13581
|
4 years ago |
|
廖湘明
|
860a995022
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
廖湘明
|
411c497eef
|
代码优化，包装查询修改hql
|
4 years ago |
|
joke.wang
|
1c8c945f8e
|
Tha 工单打印
|
4 years ago |
|
shun
|
33b05c090c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
36f37a4444
|
无锡喜德看板优化
|
4 years ago |
|
许心洁
|
b3a7d77087
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
abc5a9b812
|
BUG#新增需求：13580
|
4 years ago |
|
joke.wang
|
b702c92c42
|
半成品报表
|
4 years ago |
|
陈思洁
|
76f8675ac1
|
【13525 20027-QMES首页“产线一次合格率”没有根据“日月年”筛选条件查询数据-20201230】
|
4 years ago |
|
wynne1005
|
32ed3d388f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
7609d3449c
|
添加lob字段
|
4 years ago |
|
曾贞一
|
5ebb37173d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
曾贞一
|
aae3fb2539
|
【未完成单据提交-优化】
|
4 years ago |
|
simon.song
|
f51ad83cc0
|
返修记录报表查询条件去掉模糊查询，增加【产品条码】查询条件
|
4 years ago |
|
王杰
|
58c7b6854b
|
pom
|
4 years ago |
|
Dominic_Xiao
|
5e8e563a81
|
修改基础模块:炉子图片由与位置绑定改为与模式绑定
|
4 years ago |
|
钮海涛
|
a82d657366
|
修复坤泰问题
|
4 years ago |
|
simon.song
|
9dbfc00e6f
|
13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29
|
4 years ago |
|
simon.song
|
9ba8ae781d
|
13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29
|
4 years ago |
|
陈思洁
|
f4ffa95c4b
|
【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】
|
4 years ago |