聂帅
|
de285b7c1d
|
Merge pull request '核心包 条码 包装 表增加系统同步标志' (#295) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/295
|
4 years ago |
 王杰
|
0113ac8038
|
核心包 条码 包装 表增加系统同步标志
|
4 years ago |
 钮海涛
|
4ec97f09fe
|
解决下发按班次分割工作未考虑联组带问题
|
4 years ago |
|
钮海涛
|
df068126ff
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
# Conflicts:
# modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
|
4 years ago |
jun
|
62ddd292c9
|
17619 19081-盘点策略-增加循环规则
|
4 years ago |
|
钮海涛
|
93b26c8dfd
|
允许甘特图页面拖动组炉的工作块。
|
4 years ago |
castle.zang
|
038aef18dd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
 臧学普
|
63a8d0e2ac
|
Merge pull request '条码履历表 去除版本号字段' (#293) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/293
|
4 years ago |
|
王杰
|
697f7f1c2f
|
条码履历表 去除版本号字段
|
4 years ago |
|
castle.zang
|
a87c1bf9c2
|
王杰:条码履历表 增加 版本号 系统同步标志字段
|
4 years ago |
|
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
|
b60832e19d
|
王杰:plc查询bug
|
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 |
|
钮海涛
|
c58d1c2925
|
二车间排程功能实现
|
4 years ago |
|
钮海涛
|
5d6f52f526
|
增加基准时间间隔功能。
|
4 years ago |
|
castle.zang
|
e75c5d35ae
|
删除多余字段taskNo
|
4 years ago |
于学杰
|
ae904b8981
|
Merge pull request '增加了一个方法' (#290) from test into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/290
|
4 years ago |
|
钮海涛
|
1736ff0ac9
|
恢复部分资源评估选项。
|
4 years ago |
|
钮海涛
|
bc11a7279f
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
nies
|
17c7ff73d5
|
Merge branch 'test' into ext-dev
|
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 |
|
聂帅
|
53373c187d
|
Merge pull request '设备周期作业计划配置新增指派人字段' (#288) from dominic.xiao/i3plus-pojo:test into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/288
|
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 |
|
钮海涛
|
fd9bc81931
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
rock.yu
|
9e944b5440
|
解决代码编译不通过的问题
|
4 years ago |
|
钮海涛
|
6dd8cb52d4
|
调整甘特图拖动逻辑，不允许超出左边界，超出最大间隔给提示。
|
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 |