7435 Commits (b9283ec075f98dd67a77bc6117ae090c5d8081e4)

Author	SHA1	Message	Date
Dominic_Xiao	df35a22aac	解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句	5 years ago
Dominic_Xiao	5e1d0a75c9	解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句	5 years ago
Dominic_Xiao	4684466e7e	解决BUG:19048-班次时间显示异常:修改查询的SQL语句	5 years ago
Dominic_Xiao	f57be38c2b	解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句	5 years ago
puxiao.liao	760307910a	天津MGN系列BUG修复	5 years ago
宋军超	1b6264e80d	添加天津涂装看板	5 years ago
rock.yu	0fb04b8370	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	3ad59884a8	增加计算工单的提前时间属性	5 years ago
songss	2ed5108699	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	36928196c1	中航看板-调整返回接口参数	5 years ago
rock.yu	330cede03e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	b6a309bacf	增加 ERP 对账数据表	5 years ago
puxiao.liao	023811d0fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	6f239ee756	Fix bug#12019 ... 12019-KT根据销售订单创建销售出库单（客户发运）	5 years ago
joke.wang	5227540ecc	队列表添加索引	5 years ago
许心洁	586365dc69	任务#2893,#2894,#2901	5 years ago
陈思洁	4e013a7ef0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6fcf32aa80	【2890 10 2.3.8安灯作业优化】	5 years ago
songss	e0d315a1f8	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	d9040143f9	新增中航产线看板-每小时产量接口	5 years ago
puxiao.liao	24acb86dff	实时库存查询&导出优化	5 years ago
钮海涛	2b4ff2300d	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	582ef23ca3	修复SWEB问题	5 years ago
wynne1005	1730dc27c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4d4ad7ff84	天津注塑看板	5 years ago
puxiao.liao	62d5d62cef	北京MGN系列BUG修复	5 years ago
songss	95936d40fe	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	783022646c	新增中航产线状态图接口	5 years ago
rock.yu	a953523245	增加 ERP 快照相关表	5 years ago
钮海涛	a8cdba48c3	合并Master代码	5 years ago
钮海涛	7afd60073a	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
钮海涛	1037ad6e68	修复问题	5 years ago
puxiao.liao	3de97d5b98	北京MGN系列BUG修复	5 years ago
王杰	f6ad2824b2	11984 19048-组装生产计划报表增加字段-20201020	5 years ago
王杰	7fcbf3f4e2	:wq ... erge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
puxiao.liao	6907ab6dc0	北京麦格纳看板需求	5 years ago
王杰	97be3f186a	工单生产时间变更定时任务实体	5 years ago
钮海涛	0e75cde494	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	63a06fcc27	修改供应商端登录及供应商端代码重构	5 years ago
陈思洁	a6acf3d616	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	82a769cae1	【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 ... 2887 10 2.3.7安灯通知优化	5 years ago
许心洁	8c4ae6ff34	任务#2893,2894	5 years ago
puxiao.liao	0216cf59c4	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	051417c10e	北京麦格纳看板	5 years ago
钮海涛	ef7a20a719	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	505de36ca5	修改SWeb供应商登录接口	5 years ago
songss	ef316af0c1	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
wynne1005	78a3943a3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	4c86b836ca	OP20b逻辑变更 esop展示变更	5 years ago
汪云昊	15dc4b00c7	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ed22bd6f64	feat(form):存储过程调用适配mysql,mssql	5 years ago
puxiao.liao	56deedeaf3	北京麦格纳看板	5 years ago
puxiao.liao	c965a34236	北京麦格纳看板	5 years ago
puxiao.liao	ba81af744b	北京麦格纳看板	5 years ago
宋军超	6826f04b97	天津看板添加设备状态逻辑	5 years ago
joke.wang	9002bdc936	预装队列显示列优化	5 years ago
王杰	bb3039d1f2	包装关系查询宝贝	5 years ago
songss	17d47fdc55	新增看板图片增删改查接口 ... 新增看板切换配置增删改查接口 新增中航-产线概况接口	5 years ago
贾文涛	9a4964222c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	2301e03c85	增加呼叫不需要弹窗的枚举。	5 years ago
陈思洁	92a9f5faba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b70a58ba7d	【2867 10 2.3.9 返工返修批量作业】	5 years ago
songss	3e629e63c5	控制计划-过程检验逻辑调整	5 years ago
wynne1005	9629823a79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	b00bcf66b2	图片展示类型	5 years ago
贾文涛	00e27023c1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	525cda2768	增加数量处理方法	5 years ago
puxiao.liao	ceb882cef4	天津MGN修复BUG	5 years ago
puxiao.liao	4ca43f81cc	北京麦格纳JIS发运看板	5 years ago
钮海涛	8346aa3fae	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	66c55386ee	修复sweb的bug	5 years ago
宋军超	627e8ac215	添加麦格纳看板相关基础数据	5 years ago
陈思洁	061f48dc79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	e268ed86a9	【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】	5 years ago
汪云昊	72e25305bf	Merge remote-tracking branch 'origin/dev' into test	5 years ago
钮海涛	34a3c9553d	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	bf41628114	修改物料的标准质检时间类型为浮点数，精度为2	5 years ago
wynne1005	d13c46e740	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	5d73afd17f	jisa小时接收报表完成	5 years ago
汪云昊	a4bc17b0a6	feat(form):sap_hana数据库支持	5 years ago
puxiao.liao	1aebc6761c	Fix bug#11878 ... 19081-增加库存交易推算报表-1016	5 years ago
wynne1005	05152538b2	合并冲突	5 years ago
wynne1005	fc36e55a38	新增mes 报表查询周期枚举	5 years ago
宋军超	9c1a9be165	优化天津麦格纳报表	5 years ago
joke.wang	df063af038	物料类型1增加枚举	5 years ago
wynne1005	e24bb4c39b	同步新增忽略字段	5 years ago
wynne1005	25ebe6838c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	63c1cc479b	字段长度 model添加planCfgCode	5 years ago
joke.wang	6930fdfbe7	mgn-bj 产线枚举优化	5 years ago
钮海涛	49bf12e392	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	3e89aa9425	乐观锁增加默认值设置	5 years ago
wynne1005	7bca216063	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	8b53722b0f	设备plan更新	5 years ago
钮海涛	61d123cfc8	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	93626dad0f	新增质检完成状态报表	5 years ago
songss	578e2c5155	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
songss	bfe4b4f069	社保故障自动获取任务完善，根据不同等级调用不同的安灯接口	5 years ago
joke.wang	cd32eee8ea	排程配置表增加冗余字段	5 years ago
宋军超	fcc66835b8	开发天津看板功能	5 years ago
汪云昊	ce054916b4	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	401fccd4dc	fix(impp):DdlPreparedPack类处理大于小于错误	5 years ago
宋军超	d372256a68	添加喷涂不良类型枚举	5 years ago
wynne1005	ddaedf49ee	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	52bdc6c664	设备作业周期 新增planCfgCode	5 years ago
宋军超	bd9547b825	优化天津麦格纳报表	5 years ago
陈思洁	11b461f1d6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	1706b7a684	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
rock.yu	269f072fb8	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	8ed135734d	天津麦格纳BUG	5 years ago
joke.wang	cc2961d4b8	库存排产表增加字段	5 years ago
钮海涛	7bdecfe687	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	07282396d2	ASN到货看板问题修复	5 years ago
宋军超	3d8d84ee77	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
宋军超	dc38d2db6f	优化天津麦格纳报表	5 years ago
wynne1005	1e6ca2e0bb	添加设备作业任务 周期类型	5 years ago
rock.yu	9a2b6fe43a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	c3bdf4a162	解决10330库存扣减不准的问题	5 years ago
贾文涛	1ffebd418f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	834e3d211d	更新查询大于0的业务时，基础类错误问题。	5 years ago
puxiao.liao	ee700ab5b0	天津麦格纳多级BOM	5 years ago
wynne1005	a86a58fa6d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	75520519de	修复天津麦格纳BUG	5 years ago
joke.wang	233853e1e6	库存排程	5 years ago
puxiao.liao	502427845e	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	cfd0cb03ff	天津麦格纳BUG修复	5 years ago
王杰	f58d97fb83	11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012	5 years ago
wynne1005	248c8229ff	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	a49ddc004c	添加lob	5 years ago
rock.yu	7b8038d516	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	8932108cd3	暂时去掉乐观锁	5 years ago
puxiao.liao	2689495372	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	7027f515e4	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	df9474807c	库存条码表、库存表 增加版本号，用乐观锁控制并发问题	5 years ago
puxiao.liao	6d64c61848	修改FIFO推荐查询逻辑	5 years ago
贾文涛	0c34bce623	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	2cdb6af2f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	7e24f4ed4a	修复队列乱跳问题。	5 years ago
贾文涛	d2f9c3502a	修复队列乱跳问题。	5 years ago
wynne1005	18275c8fb2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	226c31878a	添加缺陷代码	5 years ago
汪云昊	5d7397aa4e	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	ee3f9415a7	fix(core):组织，部门代码无唯一校验	5 years ago
陈思洁	30f8e332fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	8f060d4aa4	【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】	5 years ago
钮海涛	bcf0d45000	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	445821b803	sweb问题修复	5 years ago
puxiao.liao	08687a7e14	修复天津麦格纳BUG	5 years ago
joke.wang	c442845f94	跳序变更	5 years ago
汪云昊	911f96b60d	style(softswitch):调整代码样式	5 years ago
wynne1005	95646d6317	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
汪云昊	2b6ff6498c	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	b186af893c	feat(softswitch):ftp适配信息优化	5 years ago
汪云昊	05f493b80e	feat(softswitch):添加重试功能	5 years ago
wynne1005	7fb7db3cb5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	629e6af9a9	设备指导操作文件	5 years ago
songss	9c1965ea6c	11653 19073 安灯导入模板调整	5 years ago
puxiao.liao	7508796daa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	44b5635e78	天津麦格纳PO生产任务增加关联行号	5 years ago
钮海涛	01d67fdd1f	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	7a29b85848	Fix Bug #11733 新增采购订货进度可以编辑原因	5 years ago
宋军超	4b65842d6f	修改天津麦格纳项目问题	5 years ago
wynne1005	6750da1d37	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ebf0392057	去除多余optionType枚举	5 years ago
puxiao.liao	6a42b517fc	Fix Task#2839 ... 武汉PRD-WMS&TMS装车明细接口	5 years ago
wynne1005	470775b527	备件生成冲突解决	5 years ago
wynne1005	f52f07fe77	备件导入	5 years ago
puxiao.liao	c7e5524a0a	修复无条码生产扣减增加扣减条码状态只能为入库，合格	5 years ago
汪云昊	e97a1193e1	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	27088d2db5	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	e97369585d	fix(core):在用户未登录时国际化无效	5 years ago
王杰	1dbb826235	19048-喷涂工单下发后未给打印状态赋值-20201012	5 years ago
陈思洁	e07829e4ea	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	33c59cf39e	【11654 MES管理端基础数据模块缺少导入功能 0928】	5 years ago
王杰	6f3f06a8f6	19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012	5 years ago
wynne1005	d36a7527a6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	c117515b69	设备自动报警	5 years ago
陈思洁	82ae09d2a8	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	a3100a71e5	【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】	5 years ago
钮海涛	3d5729e28b	自动打印队列增加供应商	5 years ago
puxiao.liao	90d94f35c8	Fix bug#11683 ... 质检单-已收货数量-显示优化	5 years ago
钮海涛	e628fea5a6	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5a0178f5df	合并dev代码	5 years ago
songss	a5b81cb676	解决代码冲突	5 years ago
songss	966ed3536b	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java	5 years ago
songss	5816f275bf	新增控制计划相关接口	5 years ago
钮海涛	af4bb83f85	sweb合并test代码	5 years ago
钮海涛	401e38203a	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	5515f25b79	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	c202fa073b	修改sweb问题	5 years ago
钮海涛	1695d75ff2	合并dev代码	5 years ago
钮海涛	94568777fb	合并test代码	5 years ago
钮海涛	9c7d455998	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	55dfff206f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	61ad20717b	合并sweb代码	5 years ago
曾贞一	944b853862	【代码优化】	5 years ago
曾贞一	84d5f84457	【11629 20021--北美看板需求变更--0930】	5 years ago
陈思洁	3d8d27d780	【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】	5 years ago
puxiao.liao	79baaa4546	Fix bug#11661 ... 移库单界面增加来源存储区和目标库位的检索条件	5 years ago
puxiao.liao	5033c8dde0	Fix bug#11661 ... 移库单界面增加来源存储区和目标库位的检索条件	5 years ago
wynne1005	814d22fe09	设备报警 mes端完成	5 years ago
songss	e585dce910	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	037e898cd2	新增控制计划相关接口	5 years ago
汪云昊	604b8821eb	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	815daba16d	feat(softswitch):ftp适配记录按文件名查询	5 years ago
汪云昊	21f77a0e7b	fix(softswitch):ftp适配器并发读取文件重复	5 years ago
宋军超	aa01153c4b	天津麦格纳更新看板子菜单pojo	5 years ago
宋军超	461780e0d0	天津麦格纳修改看板类型枚举	5 years ago
宋军超	ebb965f46d	天津麦格纳添加看板维护接口	5 years ago
Liquor	83bfaaceab	对SPC-KEY-TATA表的相关接口进行了相关优化。	5 years ago
汪云昊	0d20685a55	fix(softswitch):ftp适配器并发读取文件重复	5 years ago
贾文涛	72faca1092	添加索引	5 years ago
宋军超	2bd7650d48	天津麦格纳pojo中所有Double类型字段添加注解	5 years ago
Liquor	3d8842602d	增加了SPC-KEY-TATA表的相关接口。	5 years ago
puxiao.liao	65ea61fd70	增加昆泰其它出库业务类型	5 years ago
wynne1005	8129ca5bee	设备报警 mes端完成	5 years ago
汪云昊	171f39cf01	revert:还原pojo pom.xml报表	5 years ago
汪云昊	56bd07dbf3	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	e11e833309	refactor(opcua):调整pojo位置	5 years ago
puxiao.liao	76725167f7	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	f591139bed	修复TJ MGN BUG	5 years ago
joke.wang	f2177fdc1e	bypass数据采集bug修复	5 years ago
puxiao.liao	85feb7927a	修复TJ MGN BUG	5 years ago
rock.yu	68a079fa69	Merge remote-tracking branch 'origin/test' into test	5 years ago
rock.yu	14d2af59d6	增加多级BOM生效功能	5 years ago
王杰	d548660354	连续扫描	5 years ago
许心洁	a939c689f3	任务#2814	5 years ago
joke.wang	d9d7e47ca7	生产队列明细唯一索引修改	5 years ago
songss	36df78c9b4	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	8c633f0bc3	优化字段命名规范	5 years ago
puxiao.liao	0f46a23c7a	Fix bug#11611 ... 19081-计划外入库-扫描条码后撤销	5 years ago
rock.yu	605b7e846a	增加虚零件属性	5 years ago
陈思洁	d5d4942eb6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	604c1443ca	【三色灯控制信息基础页面增删改查】	5 years ago
wynne1005	ea6fc313c3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	1975906ee5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	4bd47e64c3	【接口映射-添加字段接口名称】	5 years ago
songss	d7edc3a309	增加产品数据校验记录报表接口	5 years ago
陈思洁	0f1f437a9e	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
钮海涛	543058b3a5	合并sweb代码	5 years ago
陈思洁	373e5026c5	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
陈思洁	ad2f084287	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	b8e34a34b5	【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】	5 years ago
songss	b376450d4b	修改获取复核异常的数据接口返回数据	5 years ago
wynne1005	12f1c4a809	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	708985be2a	中航 设备自动报警 #1	5 years ago
曾贞一	2f717fdd98	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	2d2ff0ddb1	【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】	5 years ago
joke.wang	9fb8962e4e	客退件bug修复	5 years ago
宋军超	979e18c4a7	天津麦格纳修改涂装质检看板	5 years ago
puxiao.liao	4bfb903e54	修复麦格那发运提交事务重复&盘点提交sql异常	5 years ago
宋军超	ba6470baad	天津麦格纳修改组托获取托包规数量	5 years ago
rock.yu	d227fcedd4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
rock.yu	11750e9bf1	修改库存快照的pojo，确保快照功能可以正常执行	5 years ago
汪云昊	ffdfd866e0	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	b2bc93abfe	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	816557085f	fix(base):修改当前页取值方法	5 years ago
wynne1005	2ae471febd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	3c1c6c8c55	新增通用对象 password	5 years ago
陈思洁	e9ce24d6f9	【2794 09 ext 19081-返工返修标签打印变更-20200813】	5 years ago
joke.wang	612c919e5f	bypass优化	5 years ago
puxiao.liao	fc351f5599	修复TJ MGN BUG	5 years ago
wynne1005	7c9c0890fa	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
songss	28d7b79f82	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	114654dd99	冲突解决	5 years ago
wynne1005	696695ef0e	海纳川变更 10923 10894	5 years ago
songss	d050274450	新增查询生产表数据接口	5 years ago
陈思洁	5fcdc2d4ea	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	053b609d88	【11559 19081-MESOP30料箱二次校验没有触发20200922】	5 years ago
汪云昊	25c195ba98	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	0ce944ec5f	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	73809df827	合并swebtest代码	5 years ago
songss	2f953ac223	新增获取中航DB复核项接口。新增修改生产数据接口	5 years ago
joke.wang	bc383d573b	生产工单增加特殊标示字段	5 years ago
钮海涛	ac4f217c9d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	c4f161e958	Start Task #2795	5 years ago
puxiao.liao	ffb45cf3dd	修复TJ MGN BUG	5 years ago
songss	90a96444e7	Merge remote-tracking branch 'origin/test' into test	5 years ago
songss	c5de9c9841	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java	5 years ago
曾贞一	0f4a8c130c	【冲突解决】	5 years ago
曾贞一	41efdd4de8	【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】	5 years ago
宋军超	61aabc957e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	735838e27f	天津麦格纳修改紧急问题	5 years ago
汪云昊	6ab0f17ac7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	d6f4fa7f92	feat(softswitch):添加报文处理状态及处理结果	5 years ago
汪云昊	673c6d0fe2	fix(softswitch):ftp-linux系统中文件读取失败	5 years ago
puxiao.liao	667d80c37d	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	0c044eed91	修复TJ MGN BUG	5 years ago
钮海涛	7b2c49f638	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	0d0905c454	sweb合并dev代码	5 years ago
puxiao.liao	4ffe517015	修复TJ MGN BUG	5 years ago
宋军超	706d0fc43d	天津麦格纳问题修改	5 years ago
陈思洁	550713320f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	d92c669f79	【11493 20042 标签条码模版需要显示客户名称 0921】	5 years ago
songss	f222395015	襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据	5 years ago
puxiao.liao	07f6aabd72	修复TJ MGN BUG	5 years ago
wynne1005	456741c116	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	e7196c3f7f	海纳川 10923 10894	5 years ago
贾文涛	8fb9760f82	对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean	5 years ago
贾文涛	772f1b9d28	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	232abdafd3	10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发	5 years ago