jun
|
3201990076
|
原材料扣减和其他功能并发，添加lock_version字段
|
4 years ago |
 钮海涛
|
cccb5f5d4f
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
480f60e63b
|
修复最大间隔无法调整时出现的死循环问题。
|
4 years ago |
 曾贞一
|
31321a4cf7
|
【合并冲突】
|
4 years ago |
|
曾贞一
|
7836b6aa40
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
3761eebb08
|
【华域-标准盘点开发】
|
4 years ago |
 王宝玉
|
35f09a6e50
|
产线多次提交数据以及 优化首页接口和不合格审理单
|
4 years ago |
潘天虎
|
88bd702b89
|
Merge pull request 'ext-dev' (#285) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/285
|
4 years ago |
puxiao.liao
|
d5f8e50dfd
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
andly.pan
|
c23b473291
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext
|
4 years ago |
|
潘天虎
|
4298304772
|
Merge pull request '增加枚举' (#284) from andly.pan/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/284
|
4 years ago |
|
andly.pan
|
98fb50c059
|
增加枚举
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
puxiao.liao
|
e3ebdfeb2c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
2fbd42bf28
|
完成四车间成型补满模功能
|
4 years ago |
Dominic_Xiao
|
9ea42cd032
|
16818 20135-热处理绑定没有定成功CMS标签成功
|
4 years ago |
|
钮海涛
|
7db1f3e3a1
|
增加Am数量计算函数，修复浮点数界面显示精度问题。
|
4 years ago |
|
曾贞一
|
45e0ef5e75
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
94274b0af9
|
【领料单页面查询优化】
|
4 years ago |
gsz
|
258e51aaf1
|
新增二车间工作工序枚举
|
4 years ago |
|
钮海涛
|
038d07f337
|
BeanRelation增加lastList可以指定中断条件的方法。
|
4 years ago |
|
Dominic_Xiao
|
6e94cb6c47
|
人员技能增加有效校验
|
4 years ago |
|
Dominic_Xiao
|
388fc9089c
|
16895 19081-PC-MES-人员技能-禁用后数据已经显示-20210730
|
4 years ago |
|
钮海涛
|
3e3d6450a8
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
gsz
|
1bf2f0057e
|
订单拆分甘特图根据单号模糊查询
|
4 years ago |
肖奕扬
|
72c61c5426
|
Merge pull request '1629 19048-组装关键件绑定增加解绑功能-20210625' (#283) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/283
|
4 years ago |
蒋鸿辉
|
cac0421b99
|
1629 19048-组装关键件绑定增加解绑功能-20210625
|
4 years ago |
|
钮海涛
|
0450e2665a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
d69c8e682b
|
销售订单拆分下发。
|
4 years ago |
|
gsz
|
cfdcf6aaff
|
订单甘特图Model
|
4 years ago |
|
gsz
|
cc6ab7dc42
|
“修改项g修改甘特图pojo
|
4 years ago |
|
puxiao.liao
|
31344a9317
|
代码合并
|
4 years ago |
|
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |
joke.wang
|
db9dcabf1f
|
报工表增加索引
|
4 years ago |
|
Dominic_Xiao
|
69e2f819f2
|
16891 19081-EOL看板-19:00至00:00显示数据为0-20210730
|
4 years ago |
|
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
|
puxiao.liao
|
e44798bd4a
|
代码合并
|
4 years ago |
Wynne
|
7de40e37f5
|
Merge branch 'dev' into test
|
4 years ago |
|
Wynne
|
bd3dcbac3a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Wynne
|
0dd2f3b3c3
|
通用界面 requestmodel修改方法组id
|
4 years ago |
|
puxiao.liao
|
af21429f34
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
14b78e5d62
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
4b1228fbbc
|
代码回滚
|
4 years ago |
castle.zang
|
f6d32bf1e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
castle.zang
|
987ecdc447
|
方法添加描述
|
4 years ago |
nies
|
553eab4a29
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
nies
|
fc8e25ecdd
|
bsp 注册参数增加方法的描述
|
4 years ago |
|
jun
|
9fbab37630
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
jun
|
aaa85e0de3
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
858f644593
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
91bd3d9021
|
北京隔离报废打印
|
4 years ago |