5447 Commits (92c13e5bcd98d5719a125886595ae3cb10625c0c)

Author	SHA1	Message	Date
王杰	cd19bfb429	ptlpcn	5 years ago
汪云昊	e0bfb4c660	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	a510196022	软删合同禁用启用功能	5 years ago
曾贞一	f16ac4a1d2	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
puxiao.liao	277d2c851c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke lin	cb09776bdb	[任务：1435 计划管理]	5 years ago
陈思洁	102af98a75	【PTL_增加主任务编号字段和组内编号字段】	5 years ago
宋军超	ac4a8b0ab4	修改ptl数据清除功能	5 years ago
许心洁	d815ca9b12	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	2c0ef55e85	解决动态查询BUG#7674,#7676+ ... 流程导入BUG#7682	5 years ago
wei.peng	d7c9647ca5	表格查询功能完成	5 years ago
陆卫豪	e43aee2e82	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
王杰	01c5bb59e1	Merge branch 'dev' into test	5 years ago
宋军超	4d701aa9c4	添加ptl数据删除定时任务	5 years ago
宋军超	5b17289c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	61d3be19cb	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/WmsDocMovementSn.java	5 years ago
puxiao.liao	0968cdc49e	【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601 ... 【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567 【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520	5 years ago
zcg	5e78985247	【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突	5 years ago
zcg	7aecf9dcc0	【task 1436 工步-关键件绑定校验并转过程条码】	5 years ago
曾贞一	eefb472117	【7650 客户标签扫描】	5 years ago
曾贞一	a9c9915a4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5cc5844e45	【库存条码实体-添加字段 包装零件号】	5 years ago
joke lin	ccf2817788	[计划管理]	5 years ago
汪云昊	dd991b44fc	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
许心洁	3d3f134d7f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c9f6f336af	动态查询：解决了BUG#7658,7660,7661,7663,7664 ... 3D仓库：联调优化逻辑	5 years ago
曾贞一	0acf2dc0ae	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	35c1114230	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
钮海涛	ca6e094271	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
luweihao	196e5c87a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	00252caa0c	移动mespcn公用model	5 years ago
puxiao.liao	50d3de9b77	7600 二维码零件标签打印功能修改。 ... 7565 收货分组功能要求。 7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 7628 库存调整盘点时，扫描库位后的提示增加一个库位 7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示 7536 没库存时领料与发运的提示修改为下列 7659 创建盘点单冻结条码时条码is_vaild=2 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。 7652 在条码状态报表中增加组号字段显示，查询框也需要增加 7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。 7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。	5 years ago
宋军超	380fded580	添加数据清理实体和死信数据定时任务	5 years ago
王杰	880d449dfb	Merge branch 'dev' into test	5 years ago
王杰	b10ddbc958	ptl enum	5 years ago
luweihao	005db6ac5b	Merge branch 'dev' into test	5 years ago
luweihao	4e70422bec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	7beaa515c8	task `1428` 作业流程	5 years ago
joke	531596d2d4	[mes: 49 JIT计划与管理]	5 years ago
王杰	e0a018b871	Merge branch 'dev' into test	5 years ago
qianhs	027470cb07	1,重试 ... 2，流程优化	5 years ago
陈思洁	fcb56e09e5	【PTL_控制器反馈信号逻辑修改】	5 years ago
王杰	03874359ac	Merge branch 'dev' of adair.song/i3plus-pojo into dev	5 years ago
王杰	dd1e5778a9	ptl enum	5 years ago
宋军超	d156ffb85a	修改数据同步，添加死信数据界面	5 years ago
王杰	fa9c02705b	ptl enum	5 years ago
王杰	269d325549	ptl	5 years ago
王杰	cd8dea1814	ptl	5 years ago
Administrator	797f3b3433	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	906576cb52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1e0d88fb0e	动态查询：开窗和时间查询优化+3D仓库基础数据校验优化	5 years ago
钮海涛	de73821fc7	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test	5 years ago
王杰	3fe76d1713	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
qianhs	0c85d7132b	1,回退代码	5 years ago
joke	a7e8e1095d	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
joke	aa403e9691	[ptl-pcn:39 校验物料号]	5 years ago
qianhs	1fc4ae1ff9	1,回退代码	5 years ago
qianhs	d87f5653a9	1,任务呢管理 ... 2，生成任务	5 years ago
王杰	68299bf421	Merge branch 'dev' of adair.song/i3plus-pojo into dev	5 years ago
宋军超	e15c2b6065	添加PTL数据同步功能	5 years ago
陈思洁	21c9af2007	【PTL_区段亮灯任务新增实体】	5 years ago
汪云昊	cb1e8d5310	任务检查校验优化 ... lac适配异常处理优化	5 years ago
王杰	1428b5f0aa	ptl	5 years ago
luweihao	9f95e97ec3	Merge branch 'test'	5 years ago
luweihao	7c77c90a3c	task 作业流程	5 years ago
曾贞一	9cc001fd17	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	fe72dc26d9	【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】	5 years ago
luweihao	dd6007656c	Merge branch 'dev' into test	5 years ago
luweihao	23874d67e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	4918707fc8	bug `7626` 开线管控-数据存入数据库错误	5 years ago
王杰	abb737f265	ptl	5 years ago
王杰	cde65d0e7a	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
王杰	cfaa7c38bc	Merge branch 'dev' of jessica.chen/i3plus-pojo into dev	5 years ago
王杰	37d032ca24	ptl反馈信息枚举	5 years ago
王杰	5610a25ab7	ptl反馈信息枚举	5 years ago
汪云昊	31a8a7705a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0471038b9b	sqlserver数据库适配	5 years ago
许心洁	df03827264	动态查询：注解enumName属性名称改为entityName	5 years ago
许心洁	a49b747c18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	cc98e84ba4	动态查询：增加开窗功能	5 years ago
陈思洁	83464294bb	【PTL_枚举引用修改】	5 years ago
宋军超	80d9852dd6	添加数据同步和定时任务功能	5 years ago
钮海涛	85dff1fde9	Merge remote-tracking branch 'origin/dev' into test	5 years ago
钮海涛	089a753be6	Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev	5 years ago
王杰	e1d133de61	ptl enum	5 years ago
qianhs	83ed87a769	【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
曾贞一	145fcac065	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	767a9b98cd	【7568 PDA收货界面增加一个搜索框，让员工可以选择ASN单据收货】	5 years ago
王杰	8c334d2ffd	平台；	5 years ago
宋军超	96c5b35f83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0a0318d639	ptl	5 years ago
宋军超	51d666b5bc	开发PTL--PCN节点维护,同步配置和对象映射功能	5 years ago
luweihao	f67dd06cd4	Merge branch 'dev' into test	5 years ago
luweihao	5a5854e0b6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	5892f87bdc	task `1425` pcn pojo 迁移	5 years ago
王杰	34e76f59ce	ptl	5 years ago
王杰	3a88bd7a78	ptl	5 years ago
王杰	51ca581f29	ptl	5 years ago
王杰	b64872fc53	ptl	5 years ago
puxiao.liao	05d0a0a375	【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件 ... 】拣货-更新FIFO推荐组件、更新FIFO检查组件	5 years ago
王杰	644af42dfe	ptl enum	5 years ago
王杰	7d13140a33	ptltag	5 years ago
joke	ada46c9626	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	d871869f3a	[ptl-pcn: 32 亮灯作业]	5 years ago
曾贞一	0a433f1ecf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	453226d6ec	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码--修改按所有时间都可以查询出来】	5 years ago
陈思洁	0f9f3c31e6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1fd3cd3329	【PTL_增加主任务状态的枚举】	5 years ago
许心洁	309eea6f5d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	b8d7feb413	动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 ... + 字段无需区分工厂	5 years ago
joke	ccd62f8d31	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	d212b5cd30	[ptl-pcn: 32 亮灯作业]	5 years ago
luweihao	6263c56c1d	Merge branch 'test'	5 years ago
luweihao	66f7121975	Merge branch 'dev' into test	5 years ago
陈思洁	d0cda06343	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	f8d4e7f1fd	【PTL_标签打印pojo新增】	5 years ago
许心洁	7e20104c52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	377391abaf	修改导入导出进度明细。	5 years ago
许心洁	7ffb5d2c98	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	632ad62c45	动态查询：查询类名需作为动态入参	5 years ago
曾贞一	1aec8a2f5f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	a620828956	【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码】	5 years ago
宋军超	d056a04403	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	85f157c6a6	设置PTL_BOM中父物料描述默认值为1	5 years ago
陈思洁	720449cd09	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	faaf184e01	【PTL_增加主任务状态的枚举】	5 years ago
宋军超	2c06163f88	添加PTL_主任务明细实体	5 years ago
qianhs	d3c30fa9be	【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】	5 years ago
luweihao	b0d214f204	Merge branch 'test'	5 years ago
luweihao	51152656cc	Merge branch 'dev' into test	5 years ago
luweihao	a0a9e6b7b3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	e2d63434db	bug `7570` `7561` 生产扣减代码去除测试代码	5 years ago
joke	3c408dd194	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	ab9e9a8638	解决冲突	5 years ago
王杰	35efadd243	ptl枚举	5 years ago
joke	6964d4cf4e	[ptl-pcn: 32 亮灯作业]	5 years ago
陈思洁	686012563f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	40094365ce	【PTL_区段亮灯任务明细状态】	5 years ago
joke	f362f9931f	[ptl:32 亮灯作业]	5 years ago
joke	c73cd26574	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	f01b3664c2	[ptl: 32 亮灯作业程序]	5 years ago
宋军超	464c8b68cc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	d56756e9e5	添加主任务、区域、区段枚举	5 years ago
陈思洁	e4ba6e21c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	cac0f91150	添加BOM中父物料描述默认值	5 years ago
陈思洁	728f46b43d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	2c305e0ca6	【修改枚举类名大写（部分）】	5 years ago
许心洁	2a09c009f3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	0fe0abff63	新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据	5 years ago
宋军超	896bd9b35b	添加基础数据枚举	5 years ago
宋军超	60ad38649d	新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据	5 years ago
luweihao	43a471d996	修改ptl项目pom	5 years ago
王杰	7662905caa	Merge branch 'test'	5 years ago
王杰	b516ca254c	解决冲突	5 years ago
王杰	39a454f89b	ptl	5 years ago
luweihao	1f4e7c5d45	Merge branch 'dev' into test	5 years ago
luweihao	b556051295	task 修改监控类位置	5 years ago
luweihao	246dd85721	Merge branch 'dev' into test	5 years ago
陈思洁	658885ade5	合并冲突	5 years ago
陈思洁	1e431aef58	【1418 新增固化看板】	5 years ago
许心洁	55e3f212ce	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f161e3bae	3D可视化仓库	5 years ago
jenkins	1ada447069	Jenkins自动合并	5 years ago
luweihao	1b727f1721	task 任务重试测试	5 years ago
luweihao	68cbd54f37	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	5fd51f6b1d	task 任务重试测试	5 years ago
qianhs	91b43823c9	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
puxiao.liao	58fe5f61d8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	53a2152ff1	【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。 ... 】bug7531	5 years ago
joke	d42b7ebbb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	2b84f93950	任务: 1424 DT通信	5 years ago
jenkins	b56d9cb824	Jenkins自动合并	5 years ago
陈思洁	970d8a3506	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c40d3360d3	【1416 新增固化时间维护】	5 years ago
汪云昊	c4149a2d11	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
luweihao	be2f1cb146	Merge branch 'dev' into test	5 years ago
luweihao	5eb7cf03ed	task 数据同步添加错误信息字段	5 years ago
jenkins	9f0a0852e7	Jenkins自动合并	5 years ago
puxiao.liao	709db0b573	【 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 ... 】bug7526	5 years ago
jenkins	1ee4a53d64	Jenkins自动合并	5 years ago
puxiao.liao	f2586f846a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	37ee72adaf	【 7523 条码拆箱功能输入数量时，此处提示改为“扫描成功，请输入新条码数量” ... 】bug7523	5 years ago
jenkins	9fc85191fe	Jenkins自动合并	5 years ago
王杰	748ef11ccf	ptl-pcn标签控制器枚举	5 years ago
puxiao.liao	759fda55b9	【 7527 1.推荐入库（推荐生产入库），如果扫描加密码错，报错有问题，2.如果扫描库位时，检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。 ... 】bug7527	5 years ago
luweihao	03a139e435	Merge branch 'dev' into test	5 years ago
luweihao	e38839db6c	task `1408` 数据同步修改	5 years ago
jenkins	499a5ed894	Jenkins自动合并	5 years ago
luweihao	846001c7a9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	1a2f00afc3	task `1408` 添加数据同步存储	5 years ago
luweihao	1ec56edcdc	task `1295` mes添加索引	5 years ago
汪云昊	f7d6192794	资源唯一校验调整为key+languageCode+softType	5 years ago
jenkins	ec0b3528f4	Jenkins自动合并	5 years ago
qianhs	243c38793b	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	1e2029fbbb	Jenkins自动合并	5 years ago
luweihao	0d212df73a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	b6477202e7	新增枚举调用类	5 years ago
jenkins	83a9b74c43	Jenkins自动合并	5 years ago
汪云昊	6d1d41a4a7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
jenkins	7decc606cb	Jenkins自动合并	5 years ago
luweihao	5afcf20a9e	ptlpcn 添加界面信号枚举	5 years ago
汪云昊	05d6f132ce	表单拾取 ... 任务检查功能优化	5 years ago
luweihao	f358c13b04	ptl迁移4	5 years ago
jenkins	0961a7ce14	Jenkins自动合并	5 years ago
qianhs	9fe977e8c0	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	106703a2be	Jenkins自动合并	5 years ago
qianhs	8477526bf5	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	a9d94ecff7	Jenkins自动合并	5 years ago
luweihao	bbfcdfdd64	ptl pojo 提交	5 years ago
luweihao	717b72e086	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	bc007c3d2b	pojo提交	5 years ago
jenkins	6a91ce5c50	Jenkins自动合并	5 years ago
qianhs	8a9c8273d8	【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	1a2b706e24	Jenkins自动合并	5 years ago
luweihao	a2bf78c87e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	3bed5974f6	ptl pojo init	5 years ago
luweihao	73af305576	迁移20200213 2	5 years ago
jenkins	594577cc69	Jenkins自动合并	5 years ago
汪云昊	821d69bd06	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	8093290bad	lac任务检查	5 years ago
puxiao.liao	901623b254	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。 ... 】bug7510	5 years ago
jenkins	218899aae9	Jenkins自动合并	5 years ago
汪云昊	4708f43149	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	f9cb6be454	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	54b167256f	【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。 ... 】bug7510	5 years ago
jenkins	67a016b261	Jenkins自动合并	5 years ago
luweihao	d750a88aad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	1c144eca4d	移除mespcn乐观锁	5 years ago
jenkins	f8fa1cd957	Jenkins自动合并	5 years ago
qianhs	9c754e5816	【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】	5 years ago
jenkins	26fd59e5c7	Jenkins自动合并	5 years ago
puxiao.liao	96e0e3756f	【 7507 发运单接收接口新增字段 ... 】bug7507	5 years ago
jenkins	24d834cd6d	Jenkins自动合并	5 years ago
qianhs	e1114d67d2	【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】	5 years ago
jenkins	7c422cad79	Jenkins自动合并	5 years ago
qianhs	591f865bf3	【成品打印需要带出客户零件号，先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号，如果找不到再用客户+零件号去找。】【bug7501】	5 years ago
jenkins	335c725bca	Jenkins自动合并	5 years ago
qianhs	4ccda48061	【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】	5 years ago
jenkins	af860ff688	Jenkins自动合并	5 years ago
钮海涛	03de37cf7c	修改导入导出进度明细。	5 years ago
钮海涛	4583b87bf5	添加导入导出进度明细。	5 years ago
jenkins	8c5020b098	Jenkins自动合并	5 years ago
曾贞一	9607c91582	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	44648e4218	【1396 亚太-领料任务明细看板】	5 years ago
jenkins	f45a0d69b0	Jenkins自动合并	5 years ago
jokelone	af31ba4884	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	54cd3cfc45	业务表增加唯一索引	5 years ago
钮海涛	e1225bbccd	添加执行命令组进度明细。	5 years ago
王杰	01e896a752	Merge branch 'dev' into test	5 years ago
曾贞一	60ab897195	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	e14e813230	【7476 发运的新老标签对应报表】	5 years ago
luweihao	d601ef9a32	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	acc907dd28	task `1295` mes添加索引	5 years ago
jenkins	27b1f5ca21	Jenkins自动合并	5 years ago
qianhs	22eaa30dab	【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】	5 years ago
汪云昊	0bd38e8e9a	打印模板查询优化	5 years ago
王杰	cd93680349	Merge branch 'dev' into test	5 years ago
jokelone	799b691aaf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	5fc59129bd	【mes-pojo 继承Serializable】	5 years ago
luweihao	5f25e311bb	mes-pcn pojo添加serializable	5 years ago
luweihao	6b66c15c72	Merge branch 'dev' into test	5 years ago
luweihao	ab3ad4c2d5	task 去除生产数据注解	5 years ago
luweihao	b27bbb6158	Merge branch 'dev' into test	5 years ago
王杰	3f77135a17	枚举	5 years ago
jenkins	138b2cf7b7	Jenkins自动合并	5 years ago
jokelone	2d807ea47a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	30cb7f7b9d	工单类型去除JIT类型	5 years ago
jenkins	1ae61084c5	Jenkins自动合并	5 years ago
曾贞一	c075875f28	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	415ae5a45b	【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】	5 years ago
jenkins	770d7175aa	Jenkins自动合并	5 years ago
钮海涛	cf203390b8	修正时间段编辑类型	5 years ago
jenkins	6e545a7ec1	Jenkins自动合并	5 years ago
袁津哲	db6522fba3	优化动态搜索与自定义列表代码	5 years ago
luweihao	2c6a4464c3	Merge branch 'dev' into test	5 years ago
luweihao	667847afe7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	d3c817529f	task `1408` 生产数据结构化	5 years ago
jenkins	521973a2f5	Jenkins自动合并	5 years ago
zcg	db3b06071d	【枚举修改】	5 years ago
zcg	8a04ca4e3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	bc1825fd35	【mes枚举修改，mesModel修改,pcn枚举修改】	5 years ago
luweihao	503f528e78	Merge branch 'dev' into test	5 years ago
luweihao	a094473333	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	4ae13f8270	task `1408` 生产数据结构化	5 years ago
jenkins	cf44b8866a	Jenkins自动合并	5 years ago
钮海涛	9e0158e749	修改test分支POM配置	5 years ago
jenkins	c90df4e96a	Jenkins自动合并	5 years ago
许心洁	28ce8615fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	51d60a107a	SAP指令锁定逻辑修改： ... 根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表； 原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；	5 years ago
jenkins	f927ee21ac	Jenkins自动合并	5 years ago
王杰	bf71cd07d0	JIS发运	5 years ago
jenkins	7e6f83a974	Jenkins自动合并	5 years ago
陈思洁	babc158ed6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5feae0dd1a	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
陈思洁	09339a6e1f	【1405 物流路线在物品分类及仓库级别的应用】	5 years ago
jenkins	a3823f4a16	Jenkins自动合并	5 years ago
袁津哲	2d30f2da0f	Wms动态搜索与自定义列表，表单开发	5 years ago
wei.peng	b199c5995f	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test ... # Conflicts: # modules/i3plus-ics-console/src/main/resources/application.properties # modules/i3plus-ics-gateway/src/main/resources/application.properties # modules/i3plus-ics-regist/src/main/resources/application.properties	5 years ago
jenkins	134757c92b	Jenkins自动合并	5 years ago
wei.peng	32d715a29c	APS 调用失败bug 修复 ... 动态报表 下拉问题修复	5 years ago
宋军超	964afe73cd	2020-01-16 16:42 添加自定义列枚举	5 years ago
宋军超	ed5a3b5acd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	851067b8d2	2020-01-16 16:37 自定义列表优化	5 years ago
jenkins	d790bcf355	Jenkins自动合并	5 years ago
luweihao	4275e1d537	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	6ec43ea151	task `1392` 修正索引	5 years ago
袁津哲	67ef5c5516	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	89a7cafee4	Wms动态搜索与自定义列表，表单开发	5 years ago
luweihao	85675cdad6	Merge branch 'dev' into test	5 years ago
luweihao	88d1e39578	压测计时	5 years ago
jenkins	33e68b7e9f	Jenkins自动合并	5 years ago
wei.peng	cb68f62e46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	8a4974f369	自定义报表 调用调整	5 years ago
jenkins	6371e8df60	Jenkins自动合并	5 years ago
袁津哲	f7c98e3982	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	a19cace3b1	Jenkins自动合并	5 years ago
puxiao.liao	86b73d43f9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	6f82fa17fd	Jenkins自动合并	5 years ago
许心洁	889c6ac548	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7f7c9ebf6e	SAP指令锁定组件逻辑修改：若根据单据号查询到了记录则不再新增了，并且调用此组件时缓存中一定得存在ORDER_NO; ... 定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口	5 years ago
qianhs	a1ec8d7293	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	da70df25ac	Jenkins自动合并	5 years ago
puxiao.liao	347197f305	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	b64327831a	【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号 ... 】bug7402	5 years ago
jokelone	3f0646403f	【bug：7408报表优化1】	5 years ago
王杰	2f5b9954d0	Merge branch 'dev' into test	5 years ago
jokelone	68e7dc8906	【bug：7408报表优化】	5 years ago
luweihao	55fad978a6	Merge branch 'dev' into test	5 years ago
钮海涛	9e34d99d9e	修复资源甘特图拖拽问题	5 years ago
jenkins	69ff58a67e	Jenkins自动合并	5 years ago
qianhs	61303a9f38	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	002ce795f4	Jenkins自动合并	5 years ago
luweihao	01a694be70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	6baeeee71e	task `1392` 调整工步 错误处理实现	5 years ago
jenkins	458137d216	Jenkins自动合并	5 years ago
许心洁	c2ba0a5663	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	fff79a7846	GROUP_COMMIT_MODE枚举漏提交	5 years ago
jenkins	e967001c75	Jenkins自动合并	5 years ago
许心洁	cb7f868d64	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
许心洁	0e54d9a5b6	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
袁津哲	ad8e51dfae	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	c1609539cf	Jenkins自动合并	5 years ago
许心洁	8eb74cef4d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	8c0b298cfe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	fd1a0ebdb8	【任务：1404 过程质量 检查项类型分组展示】	5 years ago
许心洁	de0d57179c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	35839db806	BUG#7359 任务列表分组字段和移动单赋值逻辑更改	5 years ago
jenkins	006fd3aef3	Jenkins自动合并	5 years ago
曾贞一	3a9e719005	【vda收货时，是否分组提交】	5 years ago
jenkins	8f6b53c5ea	Jenkins自动合并	5 years ago
wei.peng	3e31641b20	PTL 项目初始化 ... PTL PCN 项目初始化	5 years ago
wei.peng	e1dd7c3cdd	PTL 项目初始化	5 years ago
jenkins	274011537c	Jenkins自动合并	5 years ago
luweihao	325399127e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	28587fbb98	task `1392` 调整工步 错误处理实现	5 years ago
qianhs	f1afdf92e9	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	24f9ed25c2	Jenkins自动合并	5 years ago
qianhs	9d744318cd	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	a0b67a3723	Jenkins自动合并	5 years ago
袁津哲	8285c87624	Wms动态搜索与自定义列表，表单开发	5 years ago
jokelone	2d8b55b61a	【现场优化：59 过程质量】	5 years ago
jokelone	64f4486924	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	8ef70ed627	【现场优化：59 过程质量优化】	5 years ago
jenkins	16a414192f	Jenkins自动合并	5 years ago
曾贞一	c543043da5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	328f2e64c5	【同批次修改】	5 years ago
qianhs	2eb14492d4	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	7057c685cc	Jenkins自动合并	5 years ago
zcg	2396863bab	【任务:1383 数据监听定时数据抓取】	5 years ago
E	c7a2c79f26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	64438ac61c	Jenkins自动合并	5 years ago
qianhs	41047a17c1	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	8e168c5109	Jenkins自动合并	5 years ago
袁津哲	ff4cd68e89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	c2e66de638	Wms动态搜索与自定义列表，表单开发	5 years ago
袁津哲	86694d3ceb	Wms动态搜索与自定义列表，表单开发	5 years ago
wei.peng	503f3cd7a3	自定义表单功能优化	5 years ago
曾贞一	582115f999	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5c841c706b	【7201 收货BOP移库流程图】	5 years ago
jenkins	e88b93a22c	Jenkins自动合并	5 years ago
gcj	8245950fd3	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
gcj	51c66e9279	【宁德问题清单】	5 years ago
jenkins	8d614aef8d	Jenkins自动合并	5 years ago
陈思洁	1e0a0ff4fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c24de431d4	【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】	5 years ago
曾贞一	c3ad3d260a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	3d7f88d2ee	【7201 收货BOP移库流程图】	5 years ago
gcj	8414af2011	【按规则推送邮件】	5 years ago
gcj	890b094e15	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	7090f30b94	【按规则推送邮件】	5 years ago
jenkins	782574c73d	Jenkins自动合并	5 years ago
袁津哲	29220002b1	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	56e53906ec	Jenkins自动合并	5 years ago
袁津哲	73e8287e1f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	cf92fb2b23	Wms动态搜索与自定义列表，表单开发	5 years ago
jokelone	f1096e9ec5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	51839d7be5	【任务：1381】	5 years ago
zcg	0a8385495e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	add40a27e3	【任务：1382，数据监听基础模块开发】	5 years ago
qianhs	241350ae83	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
E	0cc70fe2d0	【#1390 基础数据-客户信息增加导入功能】	5 years ago
jenkins	b71be613fc	Jenkins自动合并	5 years ago
WYnneaoapc	ded27853a8	task 修改生产数据	5 years ago
jenkins	3db9a86504	Jenkins自动合并	5 years ago
袁津哲	fc19275ef0	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	4e0f40042a	Wms动态搜索与自定义列表，表单开发	5 years ago
陈思洁	b0065bd650	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	fa576d7a6d	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
王杰	031d57e081	JIS	5 years ago
jenkins	ebcde1d16b	Jenkins自动合并	5 years ago
jokelone	c905343349	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0a70a42336	【任务：1381 兼容Sql server】	5 years ago
许心洁	46b8c6babb	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	5 years ago
jenkins	fe71007a5c	Jenkins自动合并	5 years ago
袁津哲	42bbb852c4	Wms初始化扫描实体字段新增逻辑优化	5 years ago
汪云昊	536200cf2b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
袁津哲	2f2f24356c	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	daf3365ce3	Wms初始化扫描实体字段新增逻辑优化	5 years ago
gcj	cbe87c6bd7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	c14d6c6916	【宁德问题清单】	5 years ago
宋军超	d05fd542b3	2020-01-08添加列表菜单与对应和关系逻辑	5 years ago
袁津哲	e5138ac4e9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	e1386275d0	Wms初始化扫描实体字段新增逻辑优化	5 years ago
宋军超	b9f3ea144f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	bca93691ba	2020-01-08添加列表菜单与对应和关系逻辑	5 years ago
陈思洁	99f79ee5db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	25606ea25a	【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】	5 years ago
袁津哲	29f785ed35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	7d4ba10449	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	ae8475de5d	Jenkins自动合并	5 years ago
许心洁	2f90982e68	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	c53c8c04e3	BUG#7186	5 years ago
jenkins	852be5a130	Jenkins自动合并	5 years ago
袁津哲	76b5087e60	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	f323637c94	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	b0bbf43a9b	Jenkins自动合并	5 years ago
宋军超	5a24a08c00	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b0f60a9176	2020-01-08创建动态列表与查询model	5 years ago
钮海涛	68fc275565	修复资源甘特图拖拽问题	5 years ago
jenkins	75dc17f4c4	Jenkins自动合并	5 years ago
jokelone	d0cd9d03b9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0d7aca73a8	【需求：7315 生产工单变更】	5 years ago
王杰	54bdf8f6a0	JIS	5 years ago
e-jiawentao1	7b696d7e73	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	a92090a3ab	2020-01-07创建动态查询与表单各层	5 years ago
e-jiawentao1	c51453a856	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	9fbc120666	动态搜索与自定义列表初始化扫描Bean字段	5 years ago
jenkins	54d6d1f340	Jenkins自动合并	5 years ago
WYnneaoapc	b1d030e0dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	189bece3f7	Jenkins自动合并	5 years ago
e-jiawentao1	b2edab4ef4	2020-01-07创建动态查询与表单dao	5 years ago
e-jiawentao1	1dba90f768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
e-jiawentao1	b939ce6625	2020-01-07创建动态查询实体	5 years ago
王杰	685d7949bf	Merge branch 'dev' into test	5 years ago
zcg	d8f6a5273c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	a2041a4900	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	7d63a933c0	生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑	5 years ago
zcg	b84a305b26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	497b963f60	Jenkins自动合并	5 years ago
王杰	bf62494236	JIS	5 years ago
jenkins	fa4cc8610f	Jenkins自动合并	5 years ago
puxiao.liao	8584946ce5	【 条码状态报表，导出时下列三个字段为中文 ... 】bug7196	5 years ago
WYnneaoapc	a9f2cf2501	task 1309 大数据检索	5 years ago
zcg	c86f3e280e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0a0124cd2b	Merge branch 'dev' into test	5 years ago
jokelone	c3a7e0057b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	fea1811191	【bug：7153 JIT排序】	5 years ago
王杰	4f8898d57a	Merge branch 'dev' into test	5 years ago
王杰	bcec1d7e62	JIS	5 years ago
王杰	f88041df1e	Merge branch 'dev' into test	5 years ago
王杰	3fe50125ae	JIS	5 years ago
jokelone	c226e61acf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	d9990f0cb8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	a685cd208d	Jenkins自动合并	5 years ago
许心洁	267ec6c647	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	823f818abf	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
许心洁	fe809e2eff	定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错	5 years ago
wei.peng	44af186f2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	f2d73a0687	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	1995e55b40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	989e05c64c	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
wei.peng	d8d47541df	自定义报表调整	5 years ago
wei.peng	af6083ddff	日志存储优化	5 years ago
WYnneaoapc	227354923e	Merge branch 'test'	5 years ago
jenkins	c14ef88ea8	Jenkins自动合并	5 years ago
jokelone	68eb60c6cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	74be235a26	修复资源甘特图拖拽问题	5 years ago
钮海涛	b0bbd132c6	修复资源甘特图拖拽问题	5 years ago
zcg	f38e54e496	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	422aa1835f	Jenkins自动合并	5 years ago
钮海涛	4013ed776b	修复炉资源排程问题	5 years ago
jenkins	dfb06def2b	Jenkins自动合并	5 years ago
曾贞一	9e9d3e2afa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5a4510cedb	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
qianhs	81bab75132	【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】	5 years ago
陈思洁	bae2130d72	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	1f1f6ec825	【KT-1346 增加拉动任务的暂停和开启】	5 years ago
WYnneaoapc	3425a57669	Merge branch 'test'	5 years ago
WYnneaoapc	430e5ad6dd	Merge branch 'dev' into test	5 years ago
WYnneaoapc	76c84631ab	revise class name	5 years ago