3293 Commits (yun-zuoyi)

Author	SHA1	Message	Date
曾贞一	31321a4cf7	【合并冲突】	4 years ago
曾贞一	3761eebb08	【华域-标准盘点开发】	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
曾贞一	94274b0af9	【领料单页面查询优化】	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
Dominic_Xiao	30eb4e2194	回滚POM版本	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
jun	472504f4a8	移除华域代码	4 years ago
jun	84f686b54e	华域零星入库新增包装代码字段	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
puxiao.liao	d1a9fe37cd	修复盘点调差BUG	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
nies	5da810fb20	Merge branch 'test' into dev	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
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
gsz	c901b36663	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	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
jun	c93d9bdd2a	北京麦格纳ASN看板明细新增字段后无数据	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
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	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
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
gsz	e029090e03	南非领料单据命名规则更改  零件号*yyMMddsequenceNo --20210707	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
jun	6ba94fab3b	WmsMoveSn 删除无效多余索引映射	4 years ago
jun	3ac0d2d6dc	删除wmsStockSn无效索引映射	4 years ago
jun	79608e26e7	北京mgn ERP FG details明细报表	4 years ago
曾贞一	df1a5716fb	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	6049d5d041	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	94a6f616e7	BOM添加采购类型字段	4 years ago
puxiao.liao	b3c2e6a728	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	1e13a34883	BOM添加采购类型字段	4 years ago
puxiao.liao	4840627a7f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	e711e9f051	Excel的导出增加批注信息	4 years ago
王杰	a1fcd53e1f	Merge branch 'test' into ext-dev	4 years ago
王杰	c22117f395	Merge branch 'test' into dev	4 years ago
gsz	c557d715e4	3578 20063-供应商到货窗口时间看板-202106 ... 16556 20063-接口状态监控报表-明细数据只查询未同步数据	4 years ago
puxiao.liao	4d8240c78c	文件取消文件名称唯一约束	4 years ago
puxiao.liao	c842d3e5e5	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
gsz	4e71476f2c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
gsz	e027736364	16409 20063-PDA创建领料任务-优化校验子零件和替代料维护关系	4 years ago
wynne1005	bb88851f17	还原pom	4 years ago
puxiao.liao	7e8b0fdb42	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	ed7b2fdbfe	bug修复	4 years ago
王杰	a71774ba24	pom	4 years ago
王杰	21ca70f863	pom	4 years ago
jun	bda7b30475	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	17151a9b79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	a63ce49a89	修改单据明细查询	4 years ago
puxiao.liao	9333bfc996	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	fe3416a736	查询条件的新增	4 years ago
puxiao.liao	66fb8e5894	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	9cfcb2a59d	查询条件的增加&PO增加库存地字段	4 years ago
wynne1005	321209f2b4	Merge branch 'test' into ext-dev	4 years ago
wynne1005	e7df36d3e9	还原merge pom	4 years ago
rock.yu	38126d9812	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java	4 years ago
rock.yu	40fc186ed6	BOM, Locate POJO 增加索引	4 years ago
王杰	4fe445e4c3	test merge dev	4 years ago
puxiao.liao	582f4ba81a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	7125556090	盘点查询增加状态查询	4 years ago
曾贞一	561717b7a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	8b4bd8d8ab	【中航-优化委外发运业务】	4 years ago
puxiao.liao	4d5888ae36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	1835890e4c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	d952e7a8e9	采购收货进度报表增加列查询，窗口开始时间，窗口结束时间	4 years ago
puxiao.liao	2f903e07fa	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	224e3a9a51	字段和枚举的新增	4 years ago
puxiao.liao	2580841944	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	808f60a64a	代码优化	4 years ago
puxiao.liao	0d73e0797e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	d71434851c	增加库位名称	4 years ago
puxiao.liao	e0083530f0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	96ea96f0a2	模板明细增加是否导出模板excel 头	4 years ago
王杰	c7a62d52b5	Merge branch 'test' into ext-dev	4 years ago
李俊生	804f9240cc	零星出库单需要增加出库原因、部门、领用人（前3个调用枚举）、项目号（调用项目信息） ... 零星入库单 增加入库原因	4 years ago
王杰	4fdab21958	Merge branch 'test' into ext-dev	4 years ago
王杰	15dc951bf1	dev merge test	4 years ago
王杰	5d33795cff	test merge dev	4 years ago
andly.pan	95d72cf4af	库存交易条码新增字段（同步仪征） ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
puxiao.liao	a001dae575	代码回滚	4 years ago
李俊生	5f52b1aa33	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
李俊生	206b522af5	pom冲突	4 years ago
李俊生	adb48ef07f	南非收货提交后，需送检的零件后需要有送检的提示	4 years ago
曾贞一	54329c67ec	【同步BH成品条码JOB-优化】	4 years ago
castle.zang	4fa41f2f90	还原pom version	4 years ago
castle.zang	9a4d2060b6	修复version版本号	4 years ago
曾贞一	93c64328db	【修改-pom.xml】	4 years ago
臧学普	7aa68616bc	Merge branch 'master' into test	4 years ago
李俊生	85dd71b1ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
puxiao.liao	177cdd0b6e	库存条码表增加容器字段	4 years ago
andly.pan	43d7195a37	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
曾贞一	3e0df20273	【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】	4 years ago
puxiao.liao	5cf9c232b5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	dbd14c9d6e	导出模板字段排序维护	4 years ago
Fightgoo	82b4c948f6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
Fightgoo	021e05ebaf	15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430	4 years ago
李俊生	efaafcdcc9	仓库物料统计预警	4 years ago
曾贞一	60408db7b0	【15642 19108+wms_printing_queue 新增 part_no 字段+0429】	4 years ago
puxiao.liao	3cf1fd642e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
曾贞一	c6e80ad9a7	【3391 添加报废记录报表和修改质检不良清单表-后端】	4 years ago
andly.pan	6989180c2a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
曾贞一	ac08dc110c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	a92b87f6a0	【3391 添加报废记录报表-后端】	4 years ago
王杰	844349d583	冲突	4 years ago
王杰	21a3d716f4	pom	4 years ago
王杰	5bf5504992	pom	4 years ago
李俊生	91d7b0157d	零件转换界面增加按钮功能 ... 15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序 15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422 15471 19081-领料任务报表及明细没有拣货完成时间-20210425	4 years ago
puxiao.liao	54529730e7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	3c4c271c64	增加产品条码字段信息	4 years ago
许心洁	c4b833a259	合并test分支代码	4 years ago
李俊生	4e87b3000d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
李俊生	9ed1a5d36a	15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 ... 15108 19048-- 库存移动统计可以查看到历史记录 --20210417	4 years ago
puxiao.liao	505f80032c	导入模板下载增加是否必填字段下载	4 years ago
汪云昊	ec605315bb	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
puxiao.liao	87f3031a3d	修复软适配枚举	4 years ago
许心洁	e1f366f654	喜德任务#3349	4 years ago
许心洁	091a5b3678	流程管家重置提示+喜德任务3349	4 years ago
许心洁	2684b52775	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	a24b40d8ec	喜德任务#3349	4 years ago
puxiao.liao	39b716d2a1	修复打印异常	4 years ago
github33	4854673754	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
github33	be26c0920f	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
puxiao.liao	6030c67021	打印数据查询修改	4 years ago
github33	63dc4a2f9f	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
曾贞一	b688f4aff5	【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】	4 years ago
shun	1fbccdcf40	查询移库单增加供应商名称	4 years ago
puxiao.liao	2adc935bb0	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-mes-pcn/pom.xml sonar-project.properties	4 years ago
许心洁	f363979f24	任务#3328	4 years ago
曾贞一	f05c9bfaa4	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago