nies
|
9edf22c999
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
2b185b4c57
|
Merge pull request 'test' (#300) from qi.yuan/i3plus-pojo-ban:test into test 无锡喜德添加新增批次超期预警报表
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/300
|
4 years ago |
admin
|
e4ee9c5ce5
|
无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天
|
4 years ago |
|
admin
|
46c57ffa81
|
Merge remote-tracking branch 'ban/test' into testban
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
|
4 years ago |
|
admin
|
1493cf59e1
|
无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天
|
4 years ago |
|
admin
|
1f307b709a
|
无锡喜德添加新增批次超期预警报表 需要的值三十天,六十天,九十天
|
4 years ago |
 钮海涛
|
4cc9abae58
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
a1aaf07a96
|
修复二车间硫化问题
|
4 years ago |
|
nies
|
8d853be795
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
98706bcc20
|
Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
|
4 years ago |
Dominic_Xiao
|
923a9563c9
|
因长度过长,去除content字段的索引
|
4 years ago |
|
Dominic_Xiao
|
e7044a6dfe
|
修复数据迁移校验数据源BUG
|
4 years ago |
|
Dominic_Xiao
|
c787981c14
|
因长度过长,去除content字段的索引
|
4 years ago |
|
钮海涛
|
4a9ac431bb
|
减少四车间硫化换模次数
|
4 years ago |
|
钮海涛
|
bcd683c684
|
减少四车间硫化换模次数
|
4 years ago |
|
nies
|
eb7e63ffec
|
王杰:生产数据表 增加系统同步标志,核心包 条码 包装 表增加系统同步标志
|
4 years ago |
|
聂帅
|
a89c8d3998
|
Merge pull request '生产数据表 增加系统同步标志' (#296) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/296
|
4 years ago |
|
聂帅
|
1aafce7f47
|
Merge pull request '17619 19081-盘点策略-增加循环规则' (#294) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/294
|
4 years ago |
 王杰
|
682a086f23
|
生产数据表 增加系统同步标志
|
4 years ago |
|
聂帅
|
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 |
 臧学普
|
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 |
|
臧学普
|
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 |
|
臧学普
|
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 |