castle.zang
|
124cc7d729
|
Merge remote-tracking branch 'upstream/test' into test
|
4 years ago |
|
castle.zang
|
ace269e8aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
nies
|
5f4b8efe56
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
聂帅
|
a995805f74
|
Merge pull request '二开项目目前pojo类无法同步,在核心包新增pojo' (#303) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/303
|
4 years ago |
Dominic_Xiao
|
cbba75032a
|
二开项目目前pojo类无法同步,在核心包新增pojo
|
4 years ago |
 王杰
|
cedc61b6a8
|
索引
|
4 years ago |
|
nies
|
f8d1d85c86
|
platform 增加job执行记录相关的bean
|
4 years ago |
jun
|
49442ab5aa
|
成都麦格纳，wmsCqMaster新增构造方法
|
4 years ago |
|
王杰
|
a6ed27b901
|
索引
|
4 years ago |
|
聂帅
|
1314ee7c20
|
Merge pull request '华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货' (#301) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/301
|
4 years ago |
|
jun
|
685166caf7
|
华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货
|
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 |
|
聂帅
|
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
|
e7044a6dfe
|
修复数据迁移校验数据源BUG
|
4 years ago |
|
castle.zang
|
f3190e6bbe
|
数据冷热分离pojo
|
4 years ago |
|
Dominic_Xiao
|
c787981c14
|
因长度过长,去除content字段的索引
|
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 |
|
jun
|
62ddd292c9
|
17619 19081-盘点策略-增加循环规则
|
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
|
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 |