8660 Commits (73191c19617b643bee82e28fb31dab0b17d1c61d)

Author	SHA1	Message	Date
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
nies	3bfb61178b	修改MES_QC_CHECK_TYPE	4 years ago
nies	88781e7831	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	4850f4ccc2	新增tms的SOFT_TYPE	4 years ago
jun	d0c62b9b2d	16909 19081-生产报废单导入XLS后，单据类型是【隔离报废】，而不是正常的【生产报废单】	4 years ago
puxiao.liao	b44e02cdf6	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	54732f8fd1	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
puxiao.liao	d1a9fe37cd	修复盘点调差BUG	4 years ago
钮海涛	96c319d848	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	0bd75ba2fe	订单未完全下发最大间隔限制	4 years ago
宋双双	2ae59954d7	Merge pull request 'test' (#282) from honghui.jiang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/282	4 years ago
jhh2579	54279d43ff	中航工序外协检	4 years ago
jhh2579	9dac40797a	中航工序外协检-2	4 years ago
jhh2579	f4e6c63956	中航工序外协检	4 years ago
castle.zang	563cbab713	bsp 修改pojo	4 years ago
castle.zang	756b41e393	bsp 修改pojo,添加icloud	4 years ago
puxiao.liao	df80f5d2bf	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	4de836b28a	质检明细状态增加选别	4 years ago
nies	51160a4586	更新用户导入model	4 years ago
钮海涛	1fc8349b66	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9c9af10973	完成硫化补满模最大间隔限制，订单未完全下发未完成。	4 years ago
nies	0a36e83fd5	更新用户导入的model	4 years ago
钮海涛	3a5fad2a74	完成硫化补满模最大间隔限制，订单未完全下发未完成。	4 years ago
nies	474e181d8c	bsp注册参数增加注册类型	4 years ago
gsz	6411160219	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
gsz	4b21ff8851	南非E看板提交 修改	4 years ago
钮海涛	d0b880c7aa	牵纱拆余数到手工设备完成最大间隔限制，硫化补满模未完成。	4 years ago
puxiao.liao	24a0f1026f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
nies	5da810fb20	Merge branch 'test' into dev	4 years ago
nies	9a534c96e6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
nies	0aa24fb812	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	1e0f9a847a	新增人员导入的model类	4 years ago
钮海涛	f0147d2680	按订单排程，完成最大间隔限制，牵纱拆余数到手工设备未完成。	4 years ago
曾贞一	634dce48b9	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
曾贞一	90f0936b20	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	add0708fb2	【3617 收货入库-后端开发】	4 years ago
castle.zang	aa3ece8336	增加脚本支持，修改返回为resultBean	4 years ago
钮海涛	5b41f25711	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	13d015e79a	工序间最大间隔限制调整前	4 years ago
jun	7945213f6e	19048 -- 供应商退货选择ERP单号界面增加【已退数量】字段 --20210710	4 years ago
jun	d5fd0ec33a	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	1de5989099	华域麦格纳组托	4 years ago
jun	e5e79230db	WmsStockSn新增箱重量和托重量	4 years ago
puxiao.liao	1ff31386af	规则加载加入路径配置	4 years ago
puxiao.liao	1a403dfefd	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	efbb51711e	16826 19081-备件计划导入功能增加数量选项，便于快速导入-20210723	4 years ago
gsz	c901b36663	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
Wynne	55af273ea7	feat(Screen): 界面回显 ... 界面回显	4 years ago
曾贞一	bb48086df9	Merge remote-tracking branch 'origin/test' into test	4 years ago
曾贞一	4cd0f48f52	【查询条件】	4 years ago
jun	fdec525fa1	16788 19081-北京麦格纳，ERP明细报表优化，2021-07-16	4 years ago
puxiao.liao	ad1f48c28c	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	8e9cc32c9a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
jun	c93d9bdd2a	北京麦格纳ASN看板明细新增字段后无数据	4 years ago
castle.zang	52b70927b3	ptl亮灯增加backoff字段	4 years ago
puxiao.liao	93cfa0ec44	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	521e12b69c	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9910420ea8	完成最大间隔限制问题。	4 years ago
puxiao.liao	e4b7159fc7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	804401e12c	修复枚举导出异常	4 years ago
puxiao.liao	4250f215f2	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	09e380d1f2	属性添加枚举值注解	4 years ago
joke.wang	f0c0a4038c	ua配置	4 years ago
joke.wang	a086d24203	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	d2ec6e27a5	条码注释掉版本字段	4 years ago
puxiao.liao	e48341f47b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	4 years ago
wynne1005	8cb6abc09d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
Dominic_Xiao	4297c59ef4	去除无效索引	4 years ago
Dominic_Xiao	5c62f1b0d5	产线班次时段新增顺序字段	4 years ago
Dominic_Xiao	adfec8957d	看板班次时段增加序号	4 years ago
puxiao.liao	48fb24f3d7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	2521606f5b	删掉无效索引	4 years ago
puxiao.liao	606653ec0c	条码表增加工单，班次字段信息	4 years ago
puxiao.liao	ac535feab8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	370f4e9a02	强过报工定时任务	4 years ago
gsz	c8cdc48290	WmsECartOrderNoBuild	4 years ago
gsz	d0d34f9a8f	WmsECartOrderNoBuild	4 years ago
gsz	c4057a64ad	WmsECartOrderNoBuildRepository	4 years ago
puxiao.liao	59677dc00a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	3136ba43b1	明细增加供应商信息	4 years ago
wynne1005	c55875e129	feat(screen): 7.7 通用界面与前端完成回显 ... 7.7 通用界面与前端完成回显	4 years ago
gsz	e029090e03	南非领料单据命名规则更改  零件号*yyMMddsequenceNo --20210707	4 years ago
Dominic_Xiao	b54b31779b	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	c3a018dc1f	零件消耗数量模型	4 years ago
nies	c467fff481	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	8791ead24a	修改bsp平台执行器的注册参数	4 years ago
曾贞一	edd25a1fe3	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
gsz	2b5da37bbe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
gsz	c75973e674	南非领料单据命名规则更改 零件号*yyMMddsequenceNo	4 years ago
gsz	f5dee63b21	3579 20063-精冲预警看板-202107	4 years ago
puxiao.liao	ded6612504	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
nies	cb740da130	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	f9eac5d6af	更新AccountExportModel	4 years ago
jun	6ba94fab3b	WmsMoveSn 删除无效多余索引映射	4 years ago
jun	5ca70c8ae6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
jun	3ac0d2d6dc	删除wmsStockSn无效索引映射	4 years ago
曾贞一	95cee813c0	【jenkins打包报错】	4 years ago
jun	79608e26e7	北京mgn ERP FG details明细报表	4 years ago
曾贞一	5efca780b1	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago