8660 Commits (73191c19617b643bee82e28fb31dab0b17d1c61d)

Author	SHA1	Message	Date
nies	968708d1b8	删除多余的taskNo	4 years ago
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
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
王杰	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
王杰	697f7f1c2f	条码履历表 去除版本号字段	4 years ago
castle.zang	058585f36c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	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
王杰	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
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
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
andly.pan	c23b473291	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext	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
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
钮海涛	8b3bdc40fe	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	c8074d219a	延期订单问题修复	4 years ago
jun	472504f4a8	移除华域代码	4 years ago
Dominic_Xiao	e225dc345e	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	5a44baf73a	北京报废打印变更	4 years ago
jun	9c9e8860d0	Merge branch 'test' into ext-dev	4 years ago
jun	84f686b54e	华域零星入库新增包装代码字段	4 years ago
castle.zang	0b6ef98123	演示参数修改	4 years ago
puxiao.liao	c4a691ecb9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	20029216ea	16919 19081-生产报废单无法打印	4 years ago
jun	1b3b5ea6a5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	21a3e58b0c	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago