joke.wang
|
e967dde7a3
|
总屏幕看板优化
|
4 years ago |
Dominic_Xiao
|
553fb09bc0
|
修改hql去除多余工厂代码条件
|
4 years ago |
许心洁
|
071b0ea9ce
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
# Conflicts:
# sonar-project.properties
|
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 |
 钮海涛
|
3b8a5482ad
|
add sanlux project
|
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 |
|
钮海涛
|
8c4bf4b0fe
|
修复导入excel大数据问题
|
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 |
|
许心洁
|
3cfa736132
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
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 |
|
许心洁
|
07481f7197
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
896a88de44
|
合并测服代码
|
4 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
4 years ago |
|
王杰
|
1a0e581921
|
Merge branch 'dev' into test
|
4 years ago |
|
肖奕扬
|
8a6524ada7
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
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 |
|
肖奕扬
|
20809ff985
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
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 |
|
许心洁
|
02137638e4
|
喜德BUG:单据条码展开没有查询出单据明细的SEQNO，导致工单条码无法生成
|
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 |
|
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-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 |
andly.pan
|
ddb6fa33d3
|
条码增加道口泊位
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
shun
|
987fa02e32
|
自动打印增加重量
|
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 |
|
shun
|
ad0ddbf65e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
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 |
|
曾贞一
|
2e13f7e3f9
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
曾贞一
|
bbd5dccbf8
|
【合并分支】
|
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 |
|
Dominic_Xiao
|
11e2d8e9f9
|
卡斯马报废率趋势报表
|
4 years ago |
|
王杰
|
b25641e02b
|
数据复核
|
4 years ago |
|
puxiao.liao
|
db8c01b64c
|
修复天津BUG
|
4 years ago |
|
王杰
|
0906539b82
|
总装 数据复核
|
4 years ago |
|
许心洁
|
a9fc8ae132
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
钮海涛
|
b843db89d9
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
陈思洁
|
d1532067b7
|
【3063 不良品处理模块-添加基础配置界面 --后端】
|
4 years ago |
|
puxiao.liao
|
129002573c
|
Fix bug#13399
|
4 years ago |
|
duan.yang
|
0db629a2a1
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
王杰
|
605d620565
|
工位跳过记录
|
4 years ago |
|
puxiao.liao
|
8657926eee
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4937b49281
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
王杰
|
183a642c52
|
天津 安灯类型 增加 模具
|
4 years ago |
|
puxiao.liao
|
36d4f0ac10
|
修复天津麦格纳问题
|
4 years ago |
|
陈思洁
|
8edd1cc336
|
【3057 包装履历报表 - 后端开发】
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
yumingxing
|
1081b3a972
|
报表
|
4 years ago |
|
Dominic_Xiao
|
0cec15c1ba
|
修改基础模块:炉子图片由与位置绑定改为与模式绑定
|
4 years ago |
|
simon.song
|
4e78dc93b0
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
0ee41dbda1
|
13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29
|
4 years ago |
|
钮海涛
|
eea1084f84
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
6bfc2f92b0
|
修复坤泰问题
|
4 years ago |
|
simon.song
|
a86a189fc3
|
13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29
|
4 years ago |
|
Dominic_Xiao
|
e62bdb1f60
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
王林
|
03aefdfd9b
|
Merge branch 'dev' of frank.yu/i3plus-pojo into dev
|
4 years ago |
|
yumingxing
|
04df1faa4f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
Dominic_Xiao
|
46bbe0492d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
6bd2d191a3
|
卡斯马报废率趋势报表
|
4 years ago |
|
廖湘明
|
7f76e2ac02
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
陈思洁
|
b7a0966a16
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
9a8515eeb9
|
【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】
|
4 years ago |
|
廖湘明
|
747312eaa3
|
1.包装查询报表
2.一次性通过率报表
|
4 years ago |
|
yumingxing
|
7857ba714c
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yumingxing
|
e178bb8c67
|
生产统计报表+报废占比柏拉图报表
|
4 years ago |
|
王杰
|
cafac4312b
|
数据复核
|
4 years ago |
|
陈思洁
|
587e4f5db1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
3a98640d5d
|
【3063 不良品处理模块-添加基础配置界面 --后端】
|
4 years ago |
|
王杰
|
2e03c7b3f5
|
Merge branch 'dev' of frank.yu/i3plus-pojo into dev
|
4 years ago |
|
钮海涛
|
70b80068c2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
56630ccb0d
|
静态盘点查询单据查询不到数据问题修复
|
4 years ago |
|
puxiao.liao
|
7880fc96c9
|
修复天津BUG
|
4 years ago |
|
廖湘明
|
5e43c32131
|
1.包装查询报表
2.一次性通过率报表
|
4 years ago |
|
廖湘明
|
29500d8762
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
廖湘明
|
61364e2170
|
包装查询报表
|
4 years ago |
|
汪云昊
|
2cfbe85ab6
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
718466b8df
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
60ef8f3b96
|
feat(sms):平台短信功能
|
4 years ago |
|
许心洁
|
8c26a27218
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
819a4312ae
|
喜德WMS：BUG#13293，13295，13294
|
4 years ago |
|
王杰
|
5a0c89f79b
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
4 years ago |
|
王杰
|
b20fc8e552
|
总装 数据复核
|
4 years ago |
|
陈思洁
|
fefa52c9d2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
04f1da7f3f
|
【3057 包装履历报表 - 后端开发】
|
4 years ago |
|
puxiao.liao
|
7e400a1a68
|
Fix bug#13399
|
4 years ago |
|
duan.yang
|
f210767332
|
BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
|
王杰
|
2ccee2523a
|
工位跳过记录
|
4 years ago |
|
yumingxing
|
1bebe59cc2
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
puxiao.liao
|
87dcbd64f8
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
4e0cab2f6a
|
Fix bug#13411
ASN收货后未点击提交按钮，再次进入后无法提交
|
4 years ago |
|
puxiao.liao
|
d7d387e77c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
f63baa9c1a
|
天津 安灯类型 增加 模具
|
4 years ago |
|
puxiao.liao
|
7fcdae795c
|
修复天津麦格纳问题
|
4 years ago |
|
yumingxing
|
6b443a7d04
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
yumingxing
|
404cab525a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yumingxing
|
13ca332c4b
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
钮海涛
|
48b4e45850
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
4 years ago |
|
钮海涛
|
6e5ea4462f
|
合并master代码
|
4 years ago |
|
钮海涛
|
977b8ac23c
|
Merge remote-tracking branch 'remotes/origin/test'
|
4 years ago |
|
钮海涛
|
05dca352dd
|
修改订单履历功能
|
4 years ago |
|
puxiao.liao
|
268c04ddf3
|
Fix bug#13229
|
4 years ago |
|
yumingxing
|
4ec01b61f7
|
产品履历报表+全工序报废率报表
|
4 years ago |
|
joke.wang
|
50558289e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
b58904bd94
|
国际化优化
|
4 years ago |
|
simon.song
|
cbf86c2f7e
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
cb51636bd2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
simon.song
|
c016cb734b
|
去掉模糊查询
|
4 years ago |
|
puxiao.liao
|
6c2569ee92
|
盘点优化
|
4 years ago |
|
钮海涛
|
ded63e25db
|
坤泰问题修复
|
4 years ago |
|
陈思洁
|
cf109c6773
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
419fe3a62e
|
【13330 20027--BI详情----产线运行情况--计划完成率浮窗显示内容优化--2020-12-18】
|
4 years ago |
|
simon.song
|
3c6b869821
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
|
simon.song
|
fa9a989cbd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
23bbde2057
|
13315 20027-返修记录报表增加显示产品二维码-202012-26
|
4 years ago |
|
shun
|
c067c671a9
|
无锡喜德
|
4 years ago |
|
simon.song
|
ade9053502
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
|
Dominic_Xiao
|
97e919552a
|
修改基础模块的描述名
|
4 years ago |
|
shun
|
6f9d4b4342
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
4 years ago |
|
陈思洁
|
107f3828f9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
cc99971690
|
【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】
|
4 years ago |
|
许心洁
|
1595f68723
|
任务#3036
|
4 years ago |
|
王杰
|
7e8970f3e2
|
数据复核
|
4 years ago |
|
shun
|
fb4e79b899
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
2fd1b89425
|
无锡喜德WMS看板
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
simon.song
|
0b1ef2290d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
d648228b18
|
13300 20027-控制计划--点击生效没有响应--2020-12-16
|
4 years ago |
|
joke.wang
|
95e92168d9
|
物料追溯批次model
|
4 years ago |
|
joke.wang
|
c0d3eb807f
|
物料批次追溯报表
|
4 years ago |
廖普小
|
c45d4e8aaf
|
Merge branch 'test' of channing.zhang/i3plus-pojo into test
|
4 years ago |
|
钮海涛
|
4116dc6b91
|
修复坤泰问题
|
4 years ago |
|
许心洁
|
3f72f2ac66
|
合并TEST分支代码
|
4 years ago |
|
许心洁
|
3cf59e9edc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
88d2eefcc8
|
供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复
|
4 years ago |
liangyao
|
9f1312e906
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
ae2469e463
|
北京领料任务提交
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
30a6ef7ba5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
3467893051
|
1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
|
4 years ago |
|
曾贞一
|
15452dfa0e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
b695ab2fc3
|
【10202 20011--发运一步法配料时】
|
4 years ago |
|
王杰
|
08a458cee2
|
unpack
|
4 years ago |
|
钮海涛
|
56876e8cba
|
修复天津麦格纳问题
|
4 years ago |
|
钮海涛
|
cfcde79f1f
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
230895c243
|
修复天津麦格纳问题
|
4 years ago |
|
puxiao.liao
|
45201c42d3
|
盘点优化
|
4 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
|
puxiao.liao
|
eb56d52e17
|
盘点优化
|
4 years ago |
|
钮海涛
|
7a7169386a
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
c4023d4bac
|
坤泰问题修复
|
4 years ago |
|
joke.wang
|
ef971201e3
|
泰国新条码生成
|
4 years ago |
|
puxiao.liao
|
0bb69b6505
|
优化盘点
|
4 years ago |
|
钮海涛
|
3b700e722c
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
wynne1005
|
b438735172
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
rock.yu
|
2f912b2334
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
rock.yu
|
fe23cab34b
|
增加实体扩展注解
|
4 years ago |
|
钮海涛
|
231c4b015a
|
修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题
|
4 years ago |
|
wynne1005
|
78d86be2f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
8741facd02
|
中航BI修改 数据同步打印错误日志
|
4 years ago |
|
joke.wang
|
b37456b227
|
删除错误提交
|
4 years ago |
|
joke.wang
|
85c22ea8bd
|
电泳上线
|
4 years ago |
|
陈思洁
|
1643d57b99
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
a014d8ceaa
|
【13137 19048 安灯类型没有在看板中展示 20201209】
|
4 years ago |
|
simon.song
|
6acd271c31
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
4a120ca375
|
12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124
|
4 years ago |
|
汪云昊
|
23e1eb13a1
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
23f24d297d
|
fix(core):单号生成未正常重置
|
4 years ago |
|
wynne1005
|
fd7ef3285f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
6472ebddba
|
mes枚举格式优化
|
4 years ago |
|
puxiao.liao
|
9cd011c6ca
|
修复盘点BUG
|
4 years ago |
|
wynne1005
|
9242285b4c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
b09a09f70b
|
修改mes工位监控 异常停止不能复位问题 bi相关问题
|
4 years ago |
|
joke.wang
|
c286c3d319
|
容器扫描工步逻辑修改
|
4 years ago |
|
liangyao
|
88aea83c1a
|
北京领料任务提交
|
4 years ago |
|
陈思洁
|
981438c2a2
|
【12997 19048-条码补打查询不到二检箱标签-20201204】
|
4 years ago |
|
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
4 years ago |
|
许心洁
|
d4696b54a3
|
墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举
|
4 years ago |
|
simon.song
|
4f593ea352
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
liangyao
|
4b79ab806e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
4eef481c90
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
puxiao.liao
|
0c50abaea8
|
修复条码状态查询异常
|
4 years ago |
|
钮海涛
|
8c7da1c65a
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
3b3f0c98db
|
修复坤泰问题~
|
4 years ago |
|
simon.song
|
4676a84b07
|
删除mes-pcn包，后续引入类以mes包为主
|
4 years ago |
|
wynne1005
|
80b5cca624
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
b1e09f09a3
|
mes添加stationwebsocket 的busiType类型 强制下线
|
4 years ago |
|
liangyao
|
6142d26ee9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
d176895a5d
|
北京领料任务提交
|
4 years ago |
|
陈思洁
|
9478267dd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
4cfee2dc9c
|
【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】
|
4 years ago |
|
liangyao
|
46f56540ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
e5c7432093
|
北京领料任务提交
|
4 years ago |
|
Dominic_Xiao
|
387131bba1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
钮海涛
|
95ba4d807b
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
0923584955
|
Sweb问题修复
|
4 years ago |
|
Dominic_Xiao
|
ae9978a3bb
|
新增serialNumber字段
|
4 years ago |
|
汪云昊
|
9556c525d9
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
d2fd06cb2b
|
fix(core):单号生成规则没有清除缓存
|
4 years ago |
|
王杰
|
f9ce9641de
|
增加索引
|
4 years ago |
|
joke.wang
|
da293141cd
|
oee bug修复
|
4 years ago |
|
廖普小
|
4b0c9b927f
|
Merge branch 'test' of channing.zhang/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
|
许心洁
|
02decfe9c4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
5c1164a938
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
小梁不胖
|
9508bd41ac
|
北京领料任务提交
|
4 years ago |
|
小梁不胖
|
f744b94e87
|
北京领料报表提交
|
4 years ago |
|
puxiao.liao
|
a62b10dc9d
|
修复合并异常
|
4 years ago |
|
钮海涛
|
dfc18cc9b2
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
ffbc5d605e
|
喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB
|
5 years ago |
|
钮海涛
|
6e6a9f7526
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
b5c994a18b
|
sweb同一供应商编码命名为VendorNo
|
5 years ago |
|
simon.song
|
8dcb1703c9
|
首检返回值字段调整
|
5 years ago |
|
simon.song
|
d0e1fcd440
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
56989acba2
|
12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115
|
5 years ago |
|
汪云昊
|
bad1234d0e
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
joke.wang
|
14c47545e7
|
查询备件库存修改
|
5 years ago |
|
汪云昊
|
7348d78238
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
2b522ca15d
|
工步参数 增加字段
|
5 years ago |
|
王杰
|
183111cf65
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
王杰
|
d64a8fd31c
|
工步参数 增加字段
|
5 years ago |
|
陈思洁
|
7e37a6e22d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
28da49aa29
|
【12422 19048 增加喷涂抛光条码查询报表 20201112】
|
5 years ago |
|
王杰
|
13868d5cd1
|
producesn 增加索引
|
5 years ago |
|
王杰
|
02d002b958
|
package detail 增加 联合索引
|
5 years ago |
|
puxiao.liao
|
c20922a455
|
Fix bug#12879
COGI调账支持出库单模式
|
5 years ago |
|
simon.song
|
9b57f47af6
|
修改pom文件
|
5 years ago |
|
simon.song
|
3917408421
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
d8d2dea922
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
a4093d18d1
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
rock.yu
|
785152dbfa
|
接口同步状态赋予默认值
|
5 years ago |
|
王杰
|
a94b5dd0b0
|
看板产线配置
|
5 years ago |
|
陈思洁
|
fd166bc0ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
47e6a86ecd
|
【天津bug修改】
|
5 years ago |
|
Dominic_Xiao
|
0deb9b4733
|
中航襄阳滑道工厂需求:新增容器编号字段
|
5 years ago |
|
王杰
|
e1783e5e46
|
pom
|
5 years ago |
|
joke.wang
|
d5b2f4a4cd
|
生产队列增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
86f9faa01d
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
Dominic_Xiao
|
7b17ecbb29
|
补全代码
|
5 years ago |
|
汪云昊
|
7f2e2189c8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
7ecbed2cda
|
fix(order):未固定单号生成长度
|
5 years ago |
|
puxiao.liao
|
ca18bb40cd
|
修复天津单据明细查询对应条码：单据条码增加行号查询条件
|
5 years ago |
|
许心洁
|
5e6af26b9f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4a38aab5b6
|
任务#2989
|
5 years ago |
|
陈思洁
|
b0df747d22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
19636e308e
|
【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】
|
5 years ago |
|
wynne1005
|
d9b4a8eb4d
|
修改包扫描路径
|
5 years ago |
|
王杰
|
7be62a939b
|
TJ看板
|
5 years ago |
|
joke.wang
|
970f75f8cf
|
队列表增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
2a94ce3e0e
|
包装条码绑定解绑
|
5 years ago |
|
puxiao.liao
|
ad0325f7df
|
修复天津BUG
|
5 years ago |
|
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
|
wynne1005
|
aa450c10e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bdf8e0d782
|
错误pojo修改
|
5 years ago |
|
Dominic_Xiao
|
167b0dad0c
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
46cc056a43
|
修复天津BUG
|
5 years ago |
|
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
simon
|
e0ee86ab73
|
删除mes-pcn包，后续引入类以mes包为准
|
5 years ago |
|
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
许心洁
|
6005e2ab66
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
许心洁
|
7aa7738a59
|
BUG#12600
|
5 years ago |
|
duan.yang
|
a38be26538
|
采购订单表-主表添加同步标识、接口映射方向类型添加
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
宋双双
|
b188123ab4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
fd7799b943
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
陈思洁
|
2e1cc32ffb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0bcb009383
|
【2977 11 2.5.5 整形业务，单件翻包与整箱过站】
|
5 years ago |
|
钮海涛
|
d9bcdca66a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
eb14a581b9
|
坤泰生成包装任务
|
5 years ago |
|
duan.yang
|
802d5d2320
|
采购订单表-主表添加同步标识
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
duan.yang
|
787629581f
|
接口映射方向类型添加SWEB2SAP
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
|
许心洁
|
c1e3b01524
|
BUG#12504
|
5 years ago |
|
puxiao.liao
|
9b70e3c7bf
|
fifo 推荐过滤条码
|
5 years ago |
|
joke.wang
|
2f56f8949e
|
eol看板优化
|
5 years ago |
|
Dominic_Xiao
|
20999fd63a
|
新增不良品处理查询位置列表
|
5 years ago |
|
许心洁
|
6a95335e0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
ee37d6f5eb
|
任务#12597
|
5 years ago |
|
陈思洁
|
95c63fb30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6ffec48185
|
【2977 11 2.5.5 整形业务，单件翻包与整箱过站】
|
5 years ago |
|
王杰
|
fa3bb1f53a
|
涂装 看板
|
5 years ago |
|
钮海涛
|
8cd41d322a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
36130d12f2
|
新增供应商退货业务类型
|
5 years ago |
|
许心洁
|
c04895784a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
c679e7f19b
|
半成品看板优化
|
5 years ago |
|
许心洁
|
a604e70771
|
BUG#12711
|
5 years ago |
|
许心洁
|
3ebcfd21e7
|
BUG#12711,12509
|
5 years ago |
|
王杰
|
cf9d3d9f2d
|
tz 看板
|
5 years ago |
|
puxiao.liao
|
21cfe5c740
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
|
rock.yu
|
70f659593b
|
通用接口增加 cron 表达式的支持
|
5 years ago |
|
许心洁
|
be272fd12e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2d47eeb84d
|
BUG#12487
|
5 years ago |
|
钮海涛
|
12edbb64d5
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
6fe792f75b
|
posn新增供应商生产批次字段
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
3bad341970
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5cea79571b
|
PO订单查看按创建时间倒叙排序
|
5 years ago |
|
许心洁
|
49fb55bb42
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
66de2c1cbb
|
任务#2965
|
5 years ago |
|
joke.wang
|
f6260cec39
|
看板产线基础页面
|
5 years ago |
|
陈思洁
|
22ec710d78
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
陈思洁
|
4311fef1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
be8d655eb9
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
王杰
|
a5935b59eb
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
a6ca2b35d3
|
修复北京特殊领料
|
5 years ago |
|
puxiao.liao
|
5f73b892ba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
81543e3697
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
4392b513f7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4757408a3b
|
任务#2965
|
5 years ago |
|
王杰
|
59f916ddab
|
produceSn
|
5 years ago |
|
钮海涛
|
7381ac2ca0
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
bf51e5bb7a
|
修改登录平台为固定密码
|
5 years ago |
|
puxiao.liao
|
d4eef85177
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0fee0dbe67
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6c04caf728
|
【天津看板问题修复】
|
5 years ago |
|
puxiao.liao
|
d153205ead
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
simon
|
5b2bbf7b1e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
c03446866a
|
中航-首检单历史记录显示与修改
|
5 years ago |
|
puxiao.liao
|
9d7ae4a90f
|
修复北京特殊领料
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
4ec6267b4e
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
89a45d326b
|
合并test代码
|
5 years ago |
|
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
|
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
joke.wang
|
0009db6b33
|
工位技能查询bug修复
|
5 years ago |
|
joke.wang
|
7a33df666b
|
JSA JSP表增加索引
|
5 years ago |
|
joke.wang
|
148ef03e78
|
看板产线员工能力矩阵
|
5 years ago |
|
puxiao.liao
|
e250883f22
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
|
王杰
|
e2d6b573f0
|
不良记录报表 报工报表
|
5 years ago |
|
王杰
|
3636b75780
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
e21e49ae93
|
不良处理增加展示字段
|
5 years ago |
|
simon
|
0b68fdbee3
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
joke.wang
|
445f6b309c
|
备件消耗替代增加查询字段
|
5 years ago |
|
Dominic_Xiao
|
8e3943b306
|
Merge remote-tracking branch 'remotes/origin/test' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java
|
5 years ago |
|
王杰
|
c615475dee
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
simon
|
52974a9633
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
d3bcf1499e
|
去掉新增字段非空校验
|
5 years ago |
|
许心洁
|
0f5ab7b144
|
BUG#12609
|
5 years ago |
|
Dominic_Xiao
|
183d976c38
|
新增卡斯马展示组件模型
|
5 years ago |
|
Dominic_Xiao
|
27d76d86ae
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
a0776b7401
|
更新卡斯马展示组件,新增展示组件模型
|
5 years ago |
|
许心洁
|
79ee6eb901
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
359e085aac
|
BUG#12430
|
5 years ago |
|
陈思洁
|
92b395ad3f
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
88376bb350
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
ddc00a617b
|
【冲突】
|
5 years ago |
|
陈思洁
|
2de0d76af3
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
许心洁
|
063ba20f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
8e5c2f4b00
|
BUG#12170,12417,12166,12437,12452
|
5 years ago |
|
王杰
|
08fc0b54c6
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
22411fa928
|
备件导入增加列
|
5 years ago |
|
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
b7e2ddd2c2
|
包装明细 增加索引
|
5 years ago |
|
simon
|
faad8cf4c8
|
修复取消必填字段
|
5 years ago |
|
汪云昊
|
fdec58c92a
|
feat(form):表单导入功能支持
|
5 years ago |
|
钮海涛
|
4dd875a691
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
156b515497
|
修复SWEB问题
|
5 years ago |
|
joke.wang
|
1f306924e4
|
看板自定义参数页面
|
5 years ago |
|
宋双双
|
42feb06058
|
删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'
|
5 years ago |
|
simon
|
d8409c5b57
|
修改文件格式
|
5 years ago |
|
Dominic_Xiao
|
22a88a4dc0
|
卡斯马定时同步实体类
|
5 years ago |
|
Dominic_Xiao
|
452024abf6
|
删除多余类
|
5 years ago |
|
Dominic_Xiao
|
13bd15d997
|
回滚PCN实体类
|
5 years ago |
|
Dominic_Xiao
|
d8c52a0534
|
新增导包
|
5 years ago |
|
Dominic_Xiao
|
f551ede492
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
Dominic_Xiao
|
61638c391a
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
785e8dbfe8
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
f1fedb53f4
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
eb7ed898df
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
8d0e2b942b
|
增加卡斯马业务pojo
|
5 years ago |
|
钮海涛
|
e9ec997e05
|
Fix Bug #12413 查询库存条码错误
|
5 years ago |
|
puxiao.liao
|
dc3e344f11
|
Fix bug#12401
19048-发运单支持关联多个470单据号
|
5 years ago |
|
Dominic_Xiao
|
e919987d68
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
simon
|
7d451dc136
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
joke.wang
|
928c643031
|
看板自定义参数
|
5 years ago |
|
许心洁
|
4300201f99
|
BUG#12430,12495
|
5 years ago |
|
simon
|
4c1add6ba4
|
修改中文描述
|
5 years ago |
|
许心洁
|
a5c78ae005
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
cbd0b1f136
|
BUG#12496
|
5 years ago |
|
王杰
|
fa01ec478a
|
Mes_Package 表加索引
|
5 years ago |
|
许心洁
|
e59f67e84b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
1842d1de7c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
e3e4e1fc84
|
修复坤泰问题
|
5 years ago |
|
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
|
陈思洁
|
14f9dbed22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c6a3428cbe
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
12391 19048-条码补打(包装)增加关联批次查询条件-20201112
开线管控问题
|
5 years ago |
|
许心洁
|
ecdc5888a4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
e5aefee838
|
BUG#12166
|
5 years ago |
|
Dominic_Xiao
|
de51b68790
|
新增表:产品缺陷位置
|
5 years ago |
|
Dominic_Xiao
|
395039e901
|
新增三个字段
|
5 years ago |
|
Dominic_Xiao
|
31a1c64f69
|
新增字段:缺陷位置代码
|
5 years ago |
宋军超
|
84986eb644
|
添加天津报工报表
|
5 years ago |
|
simon
|
cea2d334e3
|
中航-修复公差上线和公差下线赋值问题
|
5 years ago |
|
Dominic_Xiao
|
ea1d51f32c
|
删除无用类
|
5 years ago |
|
Dominic_Xiao
|
5780306e94
|
增加序列化
|
5 years ago |
|
汪云昊
|
3af9790a9e
|
refactor(impp):调整描述注解
|
5 years ago |
|
汪云昊
|
206e5f8d20
|
feat(form):支持导入数据
|
5 years ago |
|
puxiao.liao
|
89bf22521a
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
王杰
|
86998e109e
|
总装 质量判定
|
5 years ago |
|
puxiao.liao
|
5f6a7c9a98
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
陈思洁
|
ad70d8f1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
fddd66796b
|
【12276 20027-PCN端 - 巡检检验- 系统生成巡检任务单时没有按照通知计划里面维护的时间去生成巡检任务 -20201105】
|
5 years ago |
|
宋军超
|
315d92f5c0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
7b6b97c1b7
|
修改天津涂装质量检测看板
|
5 years ago |
|
许心洁
|
2d9521e412
|
BUG#12166
|
5 years ago |
|
puxiao.liao
|
7b8597dde4
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
b124db3383
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
f87e4004fb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d226c27c2b
|
邮件推送增加获取附件的脚本功能
增加发送附件功能
|
5 years ago |
|
simon
|
173e145c56
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
a1dd0fa36b
|
中航-新增查询质检单检测历史接口
|
5 years ago |
|
宋军超
|
5f9d597943
|
修改天津看板评定项字段DEC->DECEMBER
|
5 years ago |
|
simon
|
e1e0c12344
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
30382c5585
|
中航-公差上线 公差下线字段调整
|
5 years ago |
|
puxiao.liao
|
c6031c2f28
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
65b26a0696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
a300e6e2f8
|
idoc 记录表增加 erp 状态字段
|
5 years ago |
|
宋军超
|
2df948207c
|
修改天津涂装看板
|
5 years ago |
|
joke.wang
|
e18b6c727e
|
mgn-bj强制封箱完成后重置数据
|
5 years ago |
|
Dominic_Xiao
|
46c0206d6a
|
卡斯马热处理翻包新增模块的dao
|
5 years ago |
|
simon
|
915b86973d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
1ba56bc59a
|
调整过程检验返回结果
|
5 years ago |
|
Dominic_Xiao
|
c2f9937b37
|
新增卡斯马热处理翻包基础模块
|
5 years ago |
|
Dominic_Xiao
|
7bb60b8f6e
|
新增卡斯马三个基础模块的查询条件封装
|
5 years ago |
|
Dominic_Xiao
|
7bb8c5cb35
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
07cd3de33f
|
新增容器位置编号字段
|
5 years ago |
|
puxiao.liao
|
7ec1bc61b0
|
天津麦格纳看板BUG修复
|
5 years ago |
|
simon
|
a6064a9a19
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
755d66dbce
|
中航-停线时根据工单删除当前“巡检项生成明细表”
|
5 years ago |
|
puxiao.liao
|
71e70e9a94
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
510845c185
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d41d14b112
|
增加 erp doc no 字段
|
5 years ago |
|
许心洁
|
97341bab27
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7dba4e7f32
|
BUG#12166
|
5 years ago |
|
许心洁
|
4d5ffce7ac
|
任务#2933
|
5 years ago |
|
汪云昊
|
f2a6ddd55a
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
426a6f2026
|
feat(ftp):ftp重试功能
|
5 years ago |
|
陈思洁
|
2911abf193
|
【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】
|
5 years ago |
|
宋军超
|
5568a8fa47
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
39da900ae1
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
7a6137a667
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
26e1b39119
|
feat(core):邮件支持附件发送
|
5 years ago |
|
宋军超
|
12074e24a8
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
5070fcc8fb
|
天津看板 员工矩阵model 新增领导
|
5 years ago |
|
宋军超
|
e19d53de4a
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
9aeecbac39
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
98fa35c8a0
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
679ef67457
|
天津麦格纳看板BUG修复
|
5 years ago |
Aisiyu
|
79161c6703
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
303fe5907d
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
rock.yu
|
7162664b79
|
通用接口增加SID记录
|
5 years ago |
|
rock.yu
|
bc3e94923f
|
增加数据源的类型
|
5 years ago |
|
Aisiyu
|
a2a4a85312
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
1680314d49
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
puxiao.liao
|
274191aee2
|
天津麦格纳看板BUG修复
|
5 years ago |
|
许心洁
|
82dc8eafbb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
3a5e446e90
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
b318abb4b8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
77d8aa4bdd
|
修改天津工单拉动逻辑
|
5 years ago |
|
Aisiyu
|
2ca398468f
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
许心洁
|
29a5d01620
|
BUG#2938
|
5 years ago |
|
puxiao.liao
|
c0d52b93f7
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
cd2076d66a
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
08011a5722
|
天津麦格纳看板BUG修复
|
5 years ago |
|
joke.wang
|
ae1bb43764
|
mgn-bj edi删除多余项
|
5 years ago |
|
Aisiyu
|
128f97c88b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
0ea3354b70
|
[1211 天津麦格纳货运看板和asn看板时间和count ]
|
5 years ago |
|
宋军超
|
6aeb6bddde
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
8d66424bf6
|
fix(form):分页错误
|
5 years ago |
|
汪云昊
|
2121124f4b
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
faf9bd4b14
|
fix(form):分页失效
|
5 years ago |
|
汪云昊
|
3b1c068290
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
eb9e520d76
|
fix(form):分页失效
|
5 years ago |
|
puxiao.liao
|
85d2f03b55
|
修复麦格纳BUG
|
5 years ago |
|
陈思洁
|
a9e8b7b010
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0be2231995
|
【12238 19073-安灯报表-通知记录-工作中心查询条件失效】
|
5 years ago |
|
王杰
|
e775db87fa
|
紧急插单
|
5 years ago |
|
wynne1005
|
9e204224f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
48c1d2c1c8
|
feat(tj) 文件上传
|
5 years ago |
|
许心洁
|
d1fb133839
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
346a5088ff
|
BUG#12231
|
5 years ago |
|
Aisiyu
|
d1c0a6ce8d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
d819821234
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
宋军超
|
9bf8018ac1
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
06c3992b98
|
添加天津涂装看板
|
5 years ago |
|
Aisiyu
|
be7f6a4a92
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
陈思洁
|
26f075233e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
48a678cc16
|
【12116 19048-工位监控-参数中选择插入条码，依旧提示过程条码在系统中不存在-20201030】
|
5 years ago |
|
宋军超
|
2f81a0f35d
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
67419496cb
|
修复天津麦格纳BUG
|
5 years ago |
|
陈思洁
|
250d2fbf14
|
【2932 11 2.3.3QMES产品追溯报表】
|
5 years ago |
|
wynne1005
|
8a648eab74
|
新增mysql连接时区
|
5 years ago |
|
simon
|
ece1ca4c01
|
调整中航看板返回，修复中航pcn原材料上线bug
|
5 years ago |
|
王杰
|
b9fef07d7f
|
总装质量判定
|
5 years ago |
|
王杰
|
12224ed8df
|
工单表加索引 ：workCenterCode workOrderStatus
|
5 years ago |
|
wynne1005
|
c118aac425
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a2cf356516
|
修改mysql驱动版本 兼容mysql8
|
5 years ago |
|
王杰
|
46c22020bd
|
总装 质量判定缺陷增加类型代码
|
5 years ago |
|
陈思洁
|
1ab0225f9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c0abb5f994
|
【12077 19048-注塑，喷涂，组装计划生产报表导出无扩展字段内容-20201026】
|
5 years ago |
|
Aisiyu
|
6b9fcb2da9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
ab0b8a2af1
|
[1211 天津麦格纳货运看板sql 修改 ]
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
|
puxiao.liao
|
a844a4d59b
|
天津麦格纳修复BUG
|
5 years ago |
|
wynne1005
|
88c942f509
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
fb5df5aedf
|
照片采集完成
|
5 years ago |
|
joke.wang
|
f38e41f1ec
|
增加看板类型
|
5 years ago |
|
宋军超
|
52c35877d8
|
添加天津涂装报表
|
5 years ago |
|
Aisiyu
|
fd08cfd883
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
28dd76f30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
11748bb19e
|
【12066 19048-喷涂展示组件颜色查询方式变更-20201024】
|
5 years ago |
|
Aisiyu
|
219dd0ddd7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
47f464b01d
|
[1211 天津麦格纳货运看板 ]
|
5 years ago |
|
曾贞一
|
143e2f1947
|
【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】
|
5 years ago |
|
puxiao.liao
|
23537e76e5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
|
王杰
|
ade2d60849
|
总装 质量判定
|
5 years ago |
|
王杰
|
d7092a7f52
|
总装标记不良
|
5 years ago |
|
宋军超
|
5d41023df6
|
修改天津涂装看板
|
5 years ago |
songss
|
532e99eb8b
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
76a0703bac
|
调整中航看板接口地址
|
5 years ago |
|
joke.wang
|
0d12d01ebf
|
生产报功表增加分组标识
|
5 years ago |
|
wynne1005
|
ff45755577
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2ff6eded6e
|
修改Oee
|
5 years ago |
|
许心洁
|
08125e3b0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
|
汪云昊
|
e87740e723
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
f47b699146
|
feat(form):支持存储过程参数
|
5 years ago |
|
曾贞一
|
4ee1875097
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
8d91675109
|
【12155 20145+系统参数页面，参数编码也支持模糊查询】
|
5 years ago |
|
puxiao.liao
|
e6e5982d73
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
63b7162932
|
mgn-bj 半成品看板
|
5 years ago |
|
汪云昊
|
dceb9b17a5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
91f68d50d4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
91b1a67f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
eb03280b2d
|
doc(sql):getStringLikePack方法标记不推荐
|
5 years ago |
|
汪云昊
|
f1ab018d85
|
feat(softswitch):重试功能
|
5 years ago |
|
曾贞一
|
b979a9471c
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
Aisiyu
|
3b5cd84e6e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
e55e8b6f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
5e8b023fd5
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
762f9d4a9b
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
Aisiyu
|
8b94991408
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
2db034a7f8
|
[1211 天津麦格纳WMS-ASN到货看板 ]
|
5 years ago |
|
宋军超
|
692cd283f7
|
添加天津涂装看板-设备实时监控
|
5 years ago |
|
puxiao.liao
|
6269ee358c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc15b56ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
许心洁
|
92fec185b8
|
任务#28142909
|
5 years ago |
|
陈思洁
|
8dfcb7f429
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3dc951c34f
|
【11964 19048-喷涂抛光报表变更-20201021】
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
曾贞一
|
5487c165ff
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
87611856dd
|
天津麦格纳多级BOM
|
5 years ago |
|
宋军超
|
37c95dc6b3
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
20ee1215d2
|
解决 包名细化 导致冲突
|
5 years ago |
|
wynne1005
|
9d81ec30d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6d4e8608c4
|
注塑 组装报表开发完毕
|
5 years ago |
|
rock.yu
|
104fa0efa5
|
完成ERP库存差异报表
|
5 years ago |
|
joke.wang
|
f57f4e25be
|
mgn-bj 总屏看板
|
5 years ago |
|
汪云昊
|
a9520cecf7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
曾贞一
|
c9378a7d8c
|
【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】
|
5 years ago |
|
许心洁
|
38ddd82ef9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
d7bad41b29
|
天津麦格纳BUG#12111，12110，12108，12105
|
5 years ago |
|
Dominic_Xiao
|
df35a22aac
|
解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
5e1d0a75c9
|
解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
4684466e7e
|
解决BUG:19048-班次时间显示异常:修改查询的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
f57be38c2b
|
解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句
|
5 years ago |
|
puxiao.liao
|
760307910a
|
天津MGN系列BUG修复
|
5 years ago |
|
宋军超
|
1b6264e80d
|
添加天津涂装看板
|
5 years ago |
|
rock.yu
|
0fb04b8370
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
3ad59884a8
|
增加计算工单的提前时间属性
|
5 years ago |
|
songss
|
2ed5108699
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
36928196c1
|
中航看板-调整返回接口参数
|
5 years ago |
|
rock.yu
|
330cede03e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
b6a309bacf
|
增加 ERP 对账数据表
|
5 years ago |
|
puxiao.liao
|
023811d0fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
6f239ee756
|
Fix bug#12019
12019-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
5227540ecc
|
队列表添加索引
|
5 years ago |
|
许心洁
|
586365dc69
|
任务#2893,#2894,#2901
|
5 years ago |
|
陈思洁
|
4e013a7ef0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6fcf32aa80
|
【2890 10 2.3.8安灯作业优化】
|
5 years ago |
|
songss
|
e0d315a1f8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
d9040143f9
|
新增中航产线看板-每小时产量接口
|
5 years ago |
|
puxiao.liao
|
24acb86dff
|
实时库存查询&导出优化
|
5 years ago |
|
钮海涛
|
2b4ff2300d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
582ef23ca3
|
修复SWEB问题
|
5 years ago |
|
wynne1005
|
1730dc27c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4d4ad7ff84
|
天津注塑看板
|
5 years ago |
|
puxiao.liao
|
62d5d62cef
|
北京MGN系列BUG修复
|
5 years ago |
|
songss
|
95936d40fe
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
783022646c
|
新增中航产线状态图接口
|
5 years ago |
|
rock.yu
|
a953523245
|
增加 ERP 快照相关表
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
1037ad6e68
|
修复问题
|
5 years ago |
|
puxiao.liao
|
3de97d5b98
|
北京MGN系列BUG修复
|
5 years ago |
|
王杰
|
f6ad2824b2
|
11984 19048-组装生产计划报表增加字段-20201020
|
5 years ago |
|
王杰
|
7fcbf3f4e2
|
:wq
erge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
puxiao.liao
|
6907ab6dc0
|
北京麦格纳看板需求
|
5 years ago |
|
王杰
|
97be3f186a
|
工单生产时间变更定时任务实体
|
5 years ago |
|
钮海涛
|
0e75cde494
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
63a06fcc27
|
修改供应商端登录及供应商端代码重构
|
5 years ago |
|
陈思洁
|
a6acf3d616
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
82a769cae1
|
【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】
2887 10 2.3.7安灯通知优化
|
5 years ago |
|
许心洁
|
8c4ae6ff34
|
任务#2893,2894
|
5 years ago |
|
puxiao.liao
|
0216cf59c4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
051417c10e
|
北京麦格纳看板
|
5 years ago |
|
钮海涛
|
ef7a20a719
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
505de36ca5
|
修改SWeb供应商登录接口
|
5 years ago |
|
songss
|
ef316af0c1
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
|
wynne1005
|
78a3943a3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4c86b836ca
|
OP20b逻辑变更 esop展示变更
|
5 years ago |
|
汪云昊
|
15dc4b00c7
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ed22bd6f64
|
feat(form):存储过程调用适配mysql,mssql
|
5 years ago |
|
puxiao.liao
|
56deedeaf3
|
北京麦格纳看板
|
5 years ago |
|
puxiao.liao
|
c965a34236
|
北京麦格纳看板
|
5 years ago |
|
puxiao.liao
|
ba81af744b
|
北京麦格纳看板
|
5 years ago |
|
宋军超
|
6826f04b97
|
天津看板添加设备状态逻辑
|
5 years ago |
|
joke.wang
|
9002bdc936
|
预装队列显示列优化
|
5 years ago |
|
王杰
|
bb3039d1f2
|
包装关系查询宝贝
|
5 years ago |
|
songss
|
17d47fdc55
|
新增看板图片增删改查接口
新增看板切换配置增删改查接口
新增中航-产线概况接口
|
5 years ago |
 贾文涛
|
9a4964222c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
2301e03c85
|
增加呼叫不需要弹窗的枚举。
|
5 years ago |
|
陈思洁
|
92a9f5faba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
b70a58ba7d
|
【2867 10 2.3.9 返工返修批量作业】
|
5 years ago |
|
songss
|
3e629e63c5
|
控制计划-过程检验逻辑调整
|
5 years ago |
|
wynne1005
|
9629823a79
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
b00bcf66b2
|
图片展示类型
|
5 years ago |
|
贾文涛
|
00e27023c1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
525cda2768
|
增加数量处理方法
|
5 years ago |
|
puxiao.liao
|
ceb882cef4
|
天津MGN修复BUG
|
5 years ago |
|
puxiao.liao
|
4ca43f81cc
|
北京麦格纳JIS发运看板
|
5 years ago |
|
钮海涛
|
8346aa3fae
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
66c55386ee
|
修复sweb的bug
|
5 years ago |
|
宋军超
|
627e8ac215
|
添加麦格纳看板相关基础数据
|
5 years ago |
|
陈思洁
|
061f48dc79
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
e268ed86a9
|
【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】
|
5 years ago |
|
汪云昊
|
72e25305bf
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
34a3c9553d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
bf41628114
|
修改物料的标准质检时间类型为浮点数，精度为2
|
5 years ago |
|
wynne1005
|
d13c46e740
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
5d73afd17f
|
jisa小时接收报表完成
|
5 years ago |
汪云昊
|
a4bc17b0a6
|
feat(form):sap_hana数据库支持
|
5 years ago |
|
puxiao.liao
|
1aebc6761c
|
Fix bug#11878
19081-增加库存交易推算报表-1016
|
5 years ago |
|
wynne1005
|
05152538b2
|
合并冲突
|
5 years ago |
|
wynne1005
|
fc36e55a38
|
新增mes 报表查询周期枚举
|
5 years ago |
|
宋军超
|
9c1a9be165
|
优化天津麦格纳报表
|
5 years ago |
|
joke.wang
|
df063af038
|
物料类型1增加枚举
|
5 years ago |
|
wynne1005
|
e24bb4c39b
|
同步新增忽略字段
|
5 years ago |
|
wynne1005
|
25ebe6838c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
63c1cc479b
|
字段长度 model添加planCfgCode
|
5 years ago |
|
joke.wang
|
6930fdfbe7
|
mgn-bj 产线枚举优化
|
5 years ago |
|
钮海涛
|
49bf12e392
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
3e89aa9425
|
乐观锁增加默认值设置
|
5 years ago |
|
wynne1005
|
7bca216063
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8b53722b0f
|
设备plan更新
|
5 years ago |
|
钮海涛
|
61d123cfc8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
93626dad0f
|
新增质检完成状态报表
|
5 years ago |
|
songss
|
578e2c5155
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
|
songss
|
bfe4b4f069
|
社保故障自动获取任务完善，根据不同等级调用不同的安灯接口
|
5 years ago |
|
joke.wang
|
cd32eee8ea
|
排程配置表增加冗余字段
|
5 years ago |
|
宋军超
|
fcc66835b8
|
开发天津看板功能
|
5 years ago |
|
汪云昊
|
ce054916b4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
401fccd4dc
|
fix(impp):DdlPreparedPack类处理大于小于错误
|
5 years ago |
|
宋军超
|
d372256a68
|
添加喷涂不良类型枚举
|
5 years ago |
|
wynne1005
|
ddaedf49ee
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
52bdc6c664
|
设备作业周期 新增planCfgCode
|
5 years ago |
|
宋军超
|
bd9547b825
|
优化天津麦格纳报表
|
5 years ago |
|
陈思洁
|
11b461f1d6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |