8874 Commits (b4873a4740119b9d76d0fd53d74ffb358f527612)

Author	SHA1	Message	Date
nies	f28f449d4a	Merge branch 'test' into ext-dev	3 years ago
nies	058a761500	(update)增加适配重复记录	3 years ago
nies	174ef833df	Merge branch 'test' into ext-dev	3 years ago
nies	ccab3f0c04	(update)BsSuitCase增加requestId	3 years ago
nies	2619f42700	Merge branch 'test' into ext-dev	3 years ago
nies	a3d2749161	(update)SuitModel 增加requestId	3 years ago
nies	dd699216ac	Merge branch 'test' into ext-dev	3 years ago
聂帅	65c22dec22	Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316	3 years ago
jun	0ef89f2a6d	18934 原材料扣减job替换	3 years ago
钮海涛	d2bbca3491	新增同班次物料相同评估规则	3 years ago
nies	4b3449863f	Merge branch 'test' into ext-dev	4 years ago
聂帅	f1e158737b	Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314	4 years ago
钮海涛	55f88edd0f	Merge pull request '资源甘特图提示' (#315) from andly.pan/i3plus-pojo:ext-dev into ext-dev ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/315	4 years ago
钮海涛	f74038f88c	强插生产计划前提交	4 years ago
andly.pan	64e48bf350	资源甘特图提示	4 years ago
曾贞一	7f7baa1ea4	【18835 19081-盘点策略-循环规则-选项可配置】	4 years ago
钮海涛	80851b5a06	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	0cf4d5742d	四车间问题修复	4 years ago
nies	204bbad81c	Merge branch 'test' into ext-dev	4 years ago
nies	38b1ce6643	(update)更新aps-4的端口为8400	4 years ago
nies	7343b4901d	Merge branch 'test' into ext-dev	4 years ago
nies	d06fe76744	增加aps_3和aps_4的枚举配置	4 years ago
nies	3d4a0e0bb9	Merge branch 'test' into ext-dev	4 years ago
jun	93d84b66f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest	4 years ago
jun	67ed074d35	18681 交易类型需要导出功能	4 years ago
Dominic_Xiao	71ad8a1e28	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
Dominic_Xiao	6ba8a2f3bb	MES_客户JIT队列下达配置增加项目代码字段	4 years ago
castle.zang	b4775eabdf	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
castle.zang	cf0e1825a3	合并jimmy代码	4 years ago
castle.zang	0c6803eb86	合并王宝玉合并请求	4 years ago
臧学普	0e5cafae91	Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/312	4 years ago
王宝玉	cdd7f7bed2	WmsBH物料子检测项新增录入方式字段	4 years ago
nies	2cff78cba2	Merge branch 'test' into ext-dev	4 years ago
聂帅	443a8a200d	Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311	4 years ago
王宝玉	4625987eef	Mes散件BOM增加项目代码字段	4 years ago
王宝玉	5056f30f45	核心包mes散件产品配置BOM新增项目代码	4 years ago
nies	7ab206edbd	Merge branch 'test' into ext-dev	4 years ago
nies	fc9ef265f9	修改aps-2的menurootid	4 years ago
nies	b2da2bd935	Merge branch 'test' into ext-dev	4 years ago
nies	0400305d91	增加aps-2的枚举配置	4 years ago
钮海涛	b623bde133	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	c8ce17363b	四车间问题修复	4 years ago
nies	39fb0508fc	Merge branch 'test' into ext-dev	4 years ago
曾贞一	7b9a91fd0f	【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】	4 years ago
gsz	365c9e927e	17789 20065-排程失败的错误需要在页面上进行提示-20211009	4 years ago
gsz	3c9bb9fff0	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo	4 years ago
钮海涛	b0fe76ab6a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	5a73e89e97	四车间问题修复	4 years ago
nies	38add62a60	Merge branch 'test' into ext-dev	4 years ago
nies	5b5e00eee7	model core 增加SysRoleModel	4 years ago
nies	72673bfa12	平台新增用户角色关联model	4 years ago
nies	28770cf619	Merge branch 'test' into ext-dev	4 years ago
castle.zang	b388ea9926	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	da300c7ccb	增加一键下发功能。	4 years ago
钮海涛	6effb386a3	增加一键下发功能。	4 years ago
钮海涛	8de712ad1d	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	462f5c9d58	增加一键下发功能。	4 years ago
nies	85782e1036	Merge branch 'test' into ext-dev	4 years ago
王杰	3270395d94	安灯	4 years ago
臧学普	9d8371bdac	Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306	4 years ago
nies	5666b5d120	软适配增加华域相关的配置	4 years ago
钮海涛	3af6e02e52	大逻辑调整前提交：部分下发的订单重新排程不影响交期早的订单。	4 years ago
钮海涛	2ec1229e75	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	e97f49d8ee	修复四车间问题	4 years ago
nies	7bf443a463	WmsActionResponseBean 删除多余的taskNO	4 years ago
nies	0f92e2bbf9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
聂帅	74dab6e6d0	Merge pull request '成都麦格纳，wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304	4 years ago
castle.zang	d771304733	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	77795be8df	StationRequestBean 增加 缓存数据来源class	4 years ago
蒋鸿辉	0cfac0aaaf	工单表增加系统同步标志字段	4 years ago
gsz	b15164d8a6	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo	4 years ago
钮海涛	29acf31f74	修复四车间问题	4 years ago
gsz	351e542fd9	18062 20065-新增报表显示顶层订单的输入和输出情况-20211019	4 years ago
nies	b8662be266	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	211d20e840	修改打印模板复杂查询	4 years ago
jun	a7b6cd22d3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest	4 years ago
钮海涛	10bd8f2f9e	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	b1af42c78b	修复四车间问题	4 years ago
jun	93f50a56be	WMS_产品报工明细信息 新增@ApiParam("是否已经生成领料单")字段	4 years ago
jun	e390e7fc33	成都：PULL_WAY_STATUS枚举新增 OVER_PULL(80, "过点拉动")	4 years ago
castle.zang	d04286164b	合并王杰：添加索引	4 years ago
castle.zang	1072745cda	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
臧学普	f7d8ee1026	Merge pull request '索引' (#302) from jhforever.wang/wangjie-i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/302	4 years ago
castle.zang	34cb9d311f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
钮海涛	5888b17cd8	修复四车间问题	4 years ago
nies	5acd3270f9	修改pom中版本为1.0.0.1	4 years ago
nies	968708d1b8	删除多余的taskNo	4 years ago
钮海涛	b16b1b0564	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	98cfaf0db2	修复四车间问题	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	ddc10672c4	Merge branch 'test' into ext-dev	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
钮海涛	4ffff9e3df	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	8406b0c3e8	修复二车间硫化问题	4 years ago
nies	9b9b9f9113	Merge branch 'test' into ext-dev	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
nies	9edf22c999	Merge branch 'test' into ext-dev	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
castle.zang	f3190e6bbe	数据冷热分离pojo	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
王杰	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
王杰	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
王杰	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
王杰	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
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
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