castle.zang
|
058585f36c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
 臧学普
|
f1db41f6ad
|
Merge pull request '条码履历表 增加 版本号 系统同步标志字段' (#292) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/292
|
4 years ago |
 王杰
|
e649024439
|
条码履历表 增加 版本号 系统同步标志字段
|
4 years ago |
|
castle.zang
|
bfe874d0c5
|
Merge remote-tracking branch 'upstream/test' into test
|
4 years ago |
|
castle.zang
|
6ffad99c58
|
bsp 日志回调pojo
|
4 years ago |
|
臧学普
|
e59d55de7d
|
Merge pull request 'plc查询bug' (#291) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/291
|
4 years ago |
|
王杰
|
9466e62ff5
|
plc查询bug
|
4 years ago |
聂帅
|
b8b9daf870
|
Merge pull request '17245 19081-出库单-条码明细-导出报错' (#289) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/289
|
4 years ago |
jun
|
9f7718d92d
|
17245 19081-出库单-条码明细-导出报错
|
4 years ago |
Dominic_Xiao
|
b8cfeb6062
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
7eaff164b8
|
设备周期作业计划新增指派人字段
|
4 years ago |
肖奕扬
|
33c26c7dd3
|
Merge branch 'ext-dev' into test
|
4 years ago |
|
Dominic_Xiao
|
f5a7487799
|
设备周期作业计划配置新增指派人字段
|
4 years ago |
rock.yu
|
9e944b5440
|
解决代码编译不通过的问题
|
4 years ago |
|
于学杰
|
0a8acc71b2
|
Merge pull request '产线多次提交数据以及 优化首页接口和不合格审理单' (#286) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/286
|
4 years ago |
|
castle.zang
|
fa4f5c6900
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
臧学普
|
e2e8d2800e
|
Merge pull request '17114 19081-返工返修显示的BYPASS项需要可以设置-20210820' (#287) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/287
|
4 years ago |
|
Dominic_Xiao
|
e2682b8a98
|
17114 19081-返工返修显示的BYPASS项需要可以设置-20210820
|
4 years ago |
puxiao.liao
|
48c3448ff0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
9b59e02e97
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
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 |