7921 Commits (f31071afc67213a4b2856ec28d893370092be6d6)

Author	SHA1	Message	Date
puxiao.liao	7e400a1a68	Fix bug#13399	4 years ago
duan.yang	f210767332	BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
王杰	2ccee2523a	工位跳过记录	4 years ago
yumingxing	1bebe59cc2	产品履历报表+全工序报废率报表	4 years ago
puxiao.liao	87dcbd64f8	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
puxiao.liao	4e0cab2f6a	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
puxiao.liao	d7d387e77c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	f63baa9c1a	天津 安灯类型 增加 模具	4 years ago
puxiao.liao	7fcdae795c	修复天津麦格纳问题	4 years ago
yumingxing	6b443a7d04	产品履历报表+全工序报废率报表	4 years ago
yumingxing	404cab525a	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
yumingxing	13ca332c4b	产品履历报表+全工序报废率报表	4 years ago
钮海涛	baed7db4ed	合并dev代码	4 years ago
钮海涛	48b4e45850	Merge remote-tracking branch 'remotes/origin/test' into dev	4 years ago
钮海涛	6e5ea4462f	合并master代码	4 years ago
钮海涛	977b8ac23c	Merge remote-tracking branch 'remotes/origin/test'	4 years ago
钮海涛	05dca352dd	修改订单履历功能	4 years ago
puxiao.liao	268c04ddf3	Fix bug#13229	4 years ago
yumingxing	4ec01b61f7	产品履历报表+全工序报废率报表	4 years ago
joke.wang	50558289e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	b58904bd94	国际化优化	4 years ago
simon.song	cbf86c2f7e	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	cb51636bd2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
simon.song	c016cb734b	去掉模糊查询	4 years ago
puxiao.liao	6c2569ee92	盘点优化	4 years ago
钮海涛	ded63e25db	坤泰问题修复	4 years ago
陈思洁	cf109c6773	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	419fe3a62e	【13330 20027--BI详情----产线运行情况--计划完成率浮窗显示内容优化--2020-12-18】	4 years ago
simon.song	3c6b869821	13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18	4 years ago
simon.song	fa9a989cbd	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	23bbde2057	13315 20027-返修记录报表增加显示产品二维码-202012-26	4 years ago
shun	c067c671a9	无锡喜德	4 years ago
simon.song	ade9053502	13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18	4 years ago
Dominic_Xiao	97e919552a	修改基础模块的描述名	4 years ago
shun	6f9d4b4342	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	d089d0fba8	Merge branch 'test' into dev	4 years ago
陈思洁	107f3828f9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	cc99971690	【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】	4 years ago
许心洁	1595f68723	任务#3036	4 years ago
王杰	7e8970f3e2	数据复核	4 years ago
shun	fb4e79b899	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
shun	2fd1b89425	无锡喜德WMS看板	4 years ago
王杰	cd5b882e1f	dev merge test pom 冲突解决	4 years ago
simon.song	0b1ef2290d	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	d648228b18	13300 20027-控制计划--点击生效没有响应--2020-12-16	4 years ago
joke.wang	95e92168d9	物料追溯批次model	4 years ago
joke.wang	c0d3eb807f	物料批次追溯报表	4 years ago
廖普小	c45d4e8aaf	Merge branch 'test' of channing.zhang/i3plus-pojo into test	4 years ago
钮海涛	4116dc6b91	修复坤泰问题	4 years ago
许心洁	3f72f2ac66	合并TEST分支代码	4 years ago
许心洁	3cf59e9edc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	88d2eefcc8	供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复	4 years ago
liangyao	9f1312e906	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	ae2469e463	北京领料任务提交	4 years ago
许心洁	3d1d05ef1c	1.天津委外发运库存移动单打印	4 years ago
许心洁	1474be7486	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	30a6ef7ba5	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	3467893051	1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读 ... 2.更正生产计划对象属性woekorderNo->workOrderNo 3.将脚本异常往外抛 4.优化通用脚本接口	4 years ago
曾贞一	15452dfa0e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	b695ab2fc3	【10202 20011--发运一步法配料时】	4 years ago
王杰	08a458cee2	unpack	4 years ago
钮海涛	56876e8cba	修复天津麦格纳问题	4 years ago
钮海涛	cfcde79f1f	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	230895c243	修复天津麦格纳问题	4 years ago
puxiao.liao	45201c42d3	盘点优化	4 years ago
wynne1005	b7c4e76163	增加joined注解	4 years ago
puxiao.liao	eb56d52e17	盘点优化	4 years ago
钮海涛	7a7169386a	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	c4023d4bac	坤泰问题修复	4 years ago
joke.wang	ef971201e3	泰国新条码生成	4 years ago
puxiao.liao	0bb69b6505	优化盘点	4 years ago
钮海涛	3b700e722c	Merge remote-tracking branch 'origin/test' into test	4 years ago
wynne1005	b438735172	Merge branch 'test' into ext-dev	4 years ago
rock.yu	2f912b2334	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
rock.yu	fe23cab34b	增加实体扩展注解	4 years ago
钮海涛	231c4b015a	修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题	4 years ago
wynne1005	78d86be2f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	8741facd02	中航BI修改 数据同步打印错误日志	4 years ago
joke.wang	b37456b227	删除错误提交	4 years ago
joke.wang	85c22ea8bd	电泳上线	4 years ago
陈思洁	1643d57b99	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	a014d8ceaa	【13137 19048 安灯类型没有在看板中展示 20201209】	4 years ago
simon.song	6acd271c31	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	4a120ca375	12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124	4 years ago
汪云昊	23e1eb13a1	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	23f24d297d	fix(core):单号生成未正常重置	4 years ago
wynne1005	fd7ef3285f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	6472ebddba	mes枚举格式优化	4 years ago
puxiao.liao	9cd011c6ca	修复盘点BUG	4 years ago
wynne1005	9242285b4c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	b09a09f70b	修改mes工位监控 异常停止不能复位问题 bi相关问题	4 years ago
joke.wang	c286c3d319	容器扫描工步逻辑修改	4 years ago
liangyao	88aea83c1a	北京领料任务提交	4 years ago
陈思洁	981438c2a2	【12997 19048-条码补打查询不到二检箱标签-20201204】	4 years ago
simon.song	effc34f74d	Merge remote-tracking branch 'remotes/origin/test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-mes-pcn/pom.xml	4 years ago
许心洁	d4696b54a3	墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举	4 years ago
simon.song	4f593ea352	Merge remote-tracking branch 'origin/test' into test	4 years ago
liangyao	4b79ab806e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	4eef481c90	Merge remote-tracking branch 'origin/test' into test	4 years ago
puxiao.liao	0c50abaea8	修复条码状态查询异常	4 years ago
钮海涛	8c7da1c65a	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	3b3f0c98db	修复坤泰问题~	4 years ago
simon.song	4676a84b07	删除mes-pcn包，后续引入类以mes包为主	4 years ago
wynne1005	80b5cca624	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	b1e09f09a3	mes添加stationwebsocket 的busiType类型 强制下线	4 years ago
liangyao	6142d26ee9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	d176895a5d	北京领料任务提交	4 years ago
陈思洁	9478267dd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	4cfee2dc9c	【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】	4 years ago
liangyao	46f56540ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	e5c7432093	北京领料任务提交	4 years ago
Dominic_Xiao	387131bba1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
钮海涛	95ba4d807b	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	0923584955	Sweb问题修复	4 years ago
Dominic_Xiao	ae9978a3bb	新增serialNumber字段	4 years ago
汪云昊	9556c525d9	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	d2fd06cb2b	fix(core):单号生成规则没有清除缓存	4 years ago
王杰	f9ce9641de	增加索引	4 years ago
joke.wang	da293141cd	oee bug修复	4 years ago
廖普小	4b0c9b927f	Merge branch 'test' of channing.zhang/i3plus-pojo into test	4 years ago
许心洁	de9578d439	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	4 years ago
许心洁	02decfe9c4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	5c1164a938	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	4 years ago
小梁不胖	9508bd41ac	北京领料任务提交	4 years ago
小梁不胖	f744b94e87	北京领料报表提交	4 years ago
puxiao.liao	a62b10dc9d	修复合并异常	4 years ago
钮海涛	dfc18cc9b2	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	ffbc5d605e	喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB	4 years ago
钮海涛	6e6a9f7526	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	b5c994a18b	sweb同一供应商编码命名为VendorNo	4 years ago
simon.song	8dcb1703c9	首检返回值字段调整	4 years ago
simon.song	d0e1fcd440	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	56989acba2	12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115	4 years ago
汪云昊	bad1234d0e	Merge remote-tracking branch 'origin/dev' into test	5 years ago
joke.wang	14c47545e7	查询备件库存修改	5 years ago
汪云昊	7348d78238	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	2b522ca15d	工步参数 增加字段	5 years ago
王杰	183111cf65	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
王杰	d64a8fd31c	工步参数 增加字段	5 years ago
陈思洁	7e37a6e22d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	28da49aa29	【12422 19048 增加喷涂抛光条码查询报表 20201112】	5 years ago
王杰	13868d5cd1	producesn 增加索引	5 years ago
王杰	02d002b958	package detail 增加 联合索引	5 years ago
puxiao.liao	c20922a455	Fix bug#12879 ... COGI调账支持出库单模式	5 years ago
simon.song	9b57f47af6	修改pom文件	5 years ago
simon.song	3917408421	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	d8d2dea922	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	a4093d18d1	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
rock.yu	785152dbfa	接口同步状态赋予默认值	5 years ago
王杰	a94b5dd0b0	看板产线配置	5 years ago
陈思洁	fd166bc0ff	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	47e6a86ecd	【天津bug修改】	5 years ago
Dominic_Xiao	0deb9b4733	中航襄阳滑道工厂需求:新增容器编号字段	5 years ago
王杰	e1783e5e46	pom	5 years ago
joke.wang	d5b2f4a4cd	生产队列增加分组号字段	5 years ago
Dominic_Xiao	86f9faa01d	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
Dominic_Xiao	7b17ecbb29	补全代码	5 years ago
汪云昊	7f2e2189c8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	7ecbed2cda	fix(order):未固定单号生成长度	5 years ago
puxiao.liao	ca18bb40cd	修复天津单据明细查询对应条码：单据条码增加行号查询条件	5 years ago
许心洁	5e6af26b9f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4a38aab5b6	任务#2989	5 years ago
陈思洁	b0df747d22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	19636e308e	【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】	5 years ago
wynne1005	d9b4a8eb4d	修改包扫描路径	5 years ago
王杰	7be62a939b	TJ看板	5 years ago
joke.wang	970f75f8cf	队列表增加分组号字段	5 years ago
Dominic_Xiao	2a94ce3e0e	包装条码绑定解绑	5 years ago
puxiao.liao	ad0325f7df	修复天津BUG	5 years ago
wynne1005	d893e76ab4	merge	5 years ago
wynne1005	aa450c10e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bdf8e0d782	错误pojo修改	5 years ago
Dominic_Xiao	167b0dad0c	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
puxiao.liao	46cc056a43	修复天津BUG	5 years ago
simon	55188db083	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
simon	e0ee86ab73	删除mes-pcn包，后续引入类以mes包为准	5 years ago
钮海涛	af732b7a4f	合并test代码	5 years ago
许心洁	6005e2ab66	Merge remote-tracking branch 'origin/test' into test	5 years ago
许心洁	7aa7738a59	BUG#12600	5 years ago
duan.yang	a38be26538	采购订单表-主表添加同步标识、接口映射方向类型添加 ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
宋双双	b188123ab4	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
Dominic_Xiao	fd7799b943	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
陈思洁	2e1cc32ffb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	0bcb009383	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
钮海涛	d9bcdca66a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	eb14a581b9	坤泰生成包装任务	5 years ago
duan.yang	802d5d2320	采购订单表-主表添加同步标识 ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
duan.yang	787629581f	接口映射方向类型添加SWEB2SAP ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
许心洁	c1e3b01524	BUG#12504	5 years ago
puxiao.liao	9b70e3c7bf	fifo 推荐过滤条码	5 years ago
joke.wang	2f56f8949e	eol看板优化	5 years ago
Dominic_Xiao	20999fd63a	新增不良品处理查询位置列表	5 years ago
许心洁	6a95335e0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	ee37d6f5eb	任务#12597	5 years ago
陈思洁	95c63fb30b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6ffec48185	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
王杰	fa3bb1f53a	涂装 看板	5 years ago
钮海涛	8cd41d322a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	36130d12f2	新增供应商退货业务类型	5 years ago
许心洁	c04895784a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	c679e7f19b	半成品看板优化	5 years ago
许心洁	a604e70771	BUG#12711	5 years ago
许心洁	3ebcfd21e7	BUG#12711,12509	5 years ago
王杰	cf9d3d9f2d	tz 看板	5 years ago
puxiao.liao	21cfe5c740	Fix bug#12004 ... 19058-KT其他出库用例	5 years ago
rock.yu	70f659593b	通用接口增加 cron 表达式的支持	5 years ago
许心洁	be272fd12e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2d47eeb84d	BUG#12487	5 years ago
钮海涛	12edbb64d5	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	6fe792f75b	posn新增供应商生产批次字段	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
钮海涛	3bad341970	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5cea79571b	PO订单查看按创建时间倒叙排序	5 years ago
许心洁	49fb55bb42	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	66de2c1cbb	任务#2965	5 years ago
joke.wang	f6260cec39	看板产线基础页面	5 years ago
陈思洁	22ec710d78	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
陈思洁	4311fef1a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	be8d655eb9	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
王杰	a5935b59eb	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
puxiao.liao	a6ca2b35d3	修复北京特殊领料	5 years ago
puxiao.liao	5f73b892ba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	81543e3697	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	4392b513f7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4757408a3b	任务#2965	5 years ago
王杰	59f916ddab	produceSn	5 years ago
钮海涛	7381ac2ca0	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	bf51e5bb7a	修改登录平台为固定密码	5 years ago
puxiao.liao	d4eef85177	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	0fee0dbe67	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6c04caf728	【天津看板问题修复】	5 years ago
puxiao.liao	d153205ead	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
simon	5b2bbf7b1e	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	c03446866a	中航-首检单历史记录显示与修改	5 years ago
puxiao.liao	9d7ae4a90f	修复北京特殊领料	5 years ago
钮海涛	b9283ec075	合并dev代码	5 years ago
钮海涛	b57ae573ed	合并test代码	5 years ago
钮海涛	4ec6267b4e	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	89a45d326b	合并test代码	5 years ago
钮海涛	f63813d66d	合并master代码	5 years ago
钮海涛	ceebe541f2	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
joke.wang	0009db6b33	工位技能查询bug修复	5 years ago
joke.wang	7a33df666b	JSA JSP表增加索引	5 years ago
joke.wang	148ef03e78	看板产线员工能力矩阵	5 years ago
puxiao.liao	e250883f22	Fix bug#12004 ... 19058-KT其他出库用例	5 years ago
王杰	e2d6b573f0	不良记录报表 报工报表	5 years ago
王杰	3636b75780	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	e21e49ae93	不良处理增加展示字段	5 years ago
simon	0b68fdbee3	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
joke.wang	445f6b309c	备件消耗替代增加查询字段	5 years ago
Dominic_Xiao	8e3943b306	Merge remote-tracking branch 'remotes/origin/test' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java	5 years ago
王杰	c615475dee	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
simon	52974a9633	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	d3bcf1499e	去掉新增字段非空校验	5 years ago
许心洁	0f5ab7b144	BUG#12609	5 years ago
Dominic_Xiao	183d976c38	新增卡斯马展示组件模型	5 years ago
Dominic_Xiao	27d76d86ae	Merge remote-tracking branch 'origin/test' into test	5 years ago
Dominic_Xiao	a0776b7401	更新卡斯马展示组件,新增展示组件模型	5 years ago
许心洁	79ee6eb901	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	359e085aac	BUG#12430	5 years ago
陈思洁	92b395ad3f	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	88376bb350	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	ddc00a617b	【冲突】	5 years ago
陈思洁	2de0d76af3	【2958 11 2.5.3 热处理上件】	5 years ago
许心洁	063ba20f74	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	8e5c2f4b00	BUG#12170,12417,12166,12437,12452	5 years ago
王杰	08fc0b54c6	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	22411fa928	备件导入增加列	5 years ago
汪云昊	f2180f18f3	revert(pojo):还原pom版本	5 years ago
汪云昊	378205ef61	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	cc947c08f5	revert(pojo):还原pom版本	5 years ago
汪云昊	8f899f2f46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	b7e2ddd2c2	包装明细 增加索引	5 years ago
simon	faad8cf4c8	修复取消必填字段	5 years ago
汪云昊	fdec58c92a	feat(form):表单导入功能支持	5 years ago
钮海涛	4dd875a691	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	156b515497	修复SWEB问题	5 years ago
joke.wang	1f306924e4	看板自定义参数页面	5 years ago
宋双双	42feb06058	删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'	5 years ago
simon	d8409c5b57	修改文件格式	5 years ago
Dominic_Xiao	22a88a4dc0	卡斯马定时同步实体类	5 years ago
Dominic_Xiao	452024abf6	删除多余类	5 years ago
Dominic_Xiao	13bd15d997	回滚PCN实体类	5 years ago
Dominic_Xiao	d8c52a0534	新增导包	5 years ago
Dominic_Xiao	f551ede492	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
Dominic_Xiao	61638c391a	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	785e8dbfe8	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	f1fedb53f4	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	eb7ed898df	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	8d0e2b942b	增加卡斯马业务pojo	5 years ago
钮海涛	e9ec997e05	Fix Bug #12413 查询库存条码错误	5 years ago
puxiao.liao	dc3e344f11	Fix bug#12401 ... 19048-发运单支持关联多个470单据号	5 years ago
Dominic_Xiao	e919987d68	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
simon	7d451dc136	Merge remote-tracking branch 'origin/test' into test	5 years ago
joke.wang	928c643031	看板自定义参数	5 years ago
许心洁	4300201f99	BUG#12430,12495	5 years ago
simon	4c1add6ba4	修改中文描述	5 years ago
许心洁	a5c78ae005	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	cbd0b1f136	BUG#12496	5 years ago
王杰	fa01ec478a	Mes_Package 表加索引	5 years ago