5997 Commits (ec3febfaa9caa66826e253f9a348cc5136568993)

Author	SHA1	Message	Date
宋军超	b96eb1b669	添加人员技能功能	5 years ago
陈思洁	2c50fceec9	【1693-设备状态监控看板】	5 years ago
陈思洁	87664b96cb	【合并冲突】	5 years ago
陈思洁	abd974f54f	【1693-设备状态监控看板】	5 years ago
钮海涛	724ba402bf	前端联调	5 years ago
曾贞一	bc82c85790	【1721 BH-BH检测结果管理】	5 years ago
袁津哲	5ba022c21a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b23915236b	开发根据实体动态生成数据库文档页面功能	5 years ago
钮海涛	60580e5ad9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	cb8688105c	task:1727;1728;1729	5 years ago
王杰	cace95fbed	ptl	5 years ago
钮海涛	3fbf532c84	修复pom版本问题	5 years ago
钮海涛	a1eb3c3bc2	修复pom版本问题	5 years ago
钮海涛	2e2ee2cc6c	Merge branch 'test' into dev	5 years ago
钮海涛	2cc43af431	修复pom版本问题	5 years ago
钮海涛	c6d36af4c9	Merge branch 'master' into test	5 years ago
joke.wang	ce1dd45842	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	755fccb45e	[任务：1690 产能监控看板]	5 years ago
曾贞一	c3b6376934	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	f3e53ff1eb	【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】 ... 【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】	5 years ago
钮海涛	7b2a4fdea7	合并dev代码	5 years ago
钮海涛	475bb9370f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
qianhs	2303186fc4	【657】【中航WMS看板－成品发运率看板】 ... 【658】【中航WMS看板－发运窗口时间看板】 【656】【 中航WMS看板－收货完成率看板】 【655】【 中航WMS看板－仓库预警看板】 【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】	5 years ago
joke.wang	ee1c2131ff	[任务：1716 写入产品下线记录]	5 years ago
钮海涛	398207b875	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	6190a4f66d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	156f0feedc	【1603 委外扣减查询】	5 years ago
joke.wang	aa9ee803b8	[任务：1683-看板管理 展示]	5 years ago
puxiao.liao	7c7691f583	bug8190【8190 中航-成品条码维护-批量修改客户代码-】	5 years ago
钮海涛	4d383dda1b	新增事务报工查询	5 years ago
joke.wang	795312637c	[任务：1683-看板管理 计划产能]	5 years ago
puxiao.liao	0a973c5dd1	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	f6988f36c8	1655 生产领料单增加替代料	5 years ago
wei.peng	3aa1afb0ce	对象历史记录 Pojo 创建	5 years ago
wei.peng	c8197f3290	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	9d3a4db040	日志查询Bug 修复	5 years ago
wei.peng	fee90baf64	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
joke.wang	e6f3dd5c32	[任务：1683-看板管理]	5 years ago
袁津哲	7789883f9b	开发导入功能模块	5 years ago
曾贞一	509240126a	【1604 待入库数据查询】	5 years ago
钮海涛	a597d78100	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	c57ca73a4a	bug:8169;8176;8177	5 years ago
王杰	9da9a568f5	mes	5 years ago
wei.peng	effae233bf	对象历史记录 Pojo 创建	5 years ago
wei.peng	fe46d8da29	1. 授权封装位置调整 ... 2. 日志控制台查询封装 3. 添加软适配 同步接口调用 4. pom.xml 引用错误修复	5 years ago
wei.peng	69346da06d	日志查询Bug 修复	5 years ago
wei.peng	dac1358009	1. 关闭register , gateway , console 日志持久化技术 ... 2. Sonar Bug 修复 3. 自定义日志持久化	5 years ago
曾贞一	312cf59f49	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	88ce1e59cf	【1604 待入库数据查询】	5 years ago
joke.wang	4e02acb9e3	[任务：1683-看板管理]	5 years ago
袁津哲	7696925c9f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	8a6c9aadef	开发导入功能模块	5 years ago
wynne1005	fb60d75eea	还原test pom	5 years ago
wynne1005	d6fe718e4c	Merge branch 'dev' into test	5 years ago
wynne1005	109c4429ce	还原dev pom	5 years ago
qianhs	0a2d9a3d6d	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
joke.wang	fa8e4c1b55	[任务：1683 看板管理]	5 years ago
wynne1005	64f3dcf276	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	cfb5aab8ea	新增工步集合 repository	5 years ago
qianhs	62883c5cc0	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
puxiao.liao	e417e761c7	bug8124【8124 物料拆分-输入数量-系统异常】	5 years ago
joke.wang	43bc24340c	[料架条码打印优化]	5 years ago
袁津哲	9518628c12	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	533d8e55e8	开发导入模块功能	5 years ago
钮海涛	1a5f3e7325	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	eb85cc232f	task:1623	5 years ago
王杰	2bb2b2c828	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev	5 years ago
王杰	d4bde19861	mes	5 years ago
wynne1005	430adb8d97	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	1c4050b71f	工步返回内容修改	5 years ago
王杰	74a4a1381c	mes	5 years ago
joke.wang	4c637b4e83	[写入JIT发运接口表]	5 years ago
joke.wang	48ee207a8a	[删除多余项]	5 years ago
joke.wang	d22bd22012	[任务：客户JIT自动下达]	5 years ago
汪云昊	ccf2f42840	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	edf0b66115	Sonar代码缺陷修复 ... 查询条件优化 拦截器，自定义按钮对外接口实现 表单-功能目录优化 软适配日志优化	5 years ago
袁津哲	df480bf11d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	36b4e67020	导入模板功能建模	5 years ago
宋军超	8fe5574c67	part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")	5 years ago
汪云昊	baaf16ad56	国际化工具类异常处理优化	5 years ago
陈思洁	5d8fec4938	合并冲突	5 years ago
陈思洁	7505087392	【mes 产品配方导入功能和基础数据维护】	5 years ago
王杰	0a14b533d7	任务1659 返工返修	5 years ago
袁津哲	ec1d8a2ff3	开发导入模板功能	5 years ago
钮海涛	b25ff3cbba	bug:8137	5 years ago
曾贞一	9102a3691b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	10fc6ded8d	【1558 生产工单管理-泰国需求】	5 years ago
joke.wang	280385eb20	[bug: 8092 SOP信息需求变更]	5 years ago
joke.wang	54ff0deb87	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	efe083a9da	修复版本号	5 years ago
宋军超	e464b4d699	删除设备备件管理相关实体	5 years ago
宋军超	38fa894817	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	89a9946432	添加设备管理相关功能	5 years ago
钮海涛	100d8b0019	Merge branch 'test' into dev	5 years ago
钮海涛	c75a25b854	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	bd810c1c8c	task:1591	5 years ago
joke.wang	b17cf60ac6	[任务：1571 生成报功数据 需求变更]	5 years ago
王杰	cba7ee3d0d	[任务：1522，ptl流程设计]	5 years ago
qianhs	88279f9b8b	sonar bug修改	5 years ago
曾贞一	e5c275499c	【冲突解决】	5 years ago
曾贞一	255aefbcef	【1585 销售订单管理-销售订单维护】	5 years ago
钮海涛	e64134a821	修复合并问题	5 years ago
钮海涛	e9ec4cecfe	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	00fce0bded	新增客户物料发往地	5 years ago
wynne1005	0e934f9af6	task `1565` 发运enum	5 years ago
wynne1005	81f05c233a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	93622f5dc7	中航 开线管控 提交	5 years ago
汪云昊	f09159dffa	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	34c77d6944	ICS 注册中心监控接口，Actuator对外端口调整	5 years ago
puxiao.liao	a2f7c3426e	bug7994【7994 麦格纳收货需求差异】	5 years ago
钮海涛	01d3eeea51	新增客户物料发往地	5 years ago
钮海涛	16f6861ecd	新增窗口时间	5 years ago
宋军超	aac4e24113	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	b02d7372f6	添加散件bom批量导入功能	5 years ago
joke.wang	9e0fbef169	[按钮组件代码优化]	5 years ago
钮海涛	dd9ae231c8	与界面联调物料扩展属性	5 years ago
wynne1005	48f94c0369	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	cc739eac24	task `1565` 发运pojo	5 years ago
钮海涛	331fb73d28	新增供应商维护基础数据	5 years ago
joke.wang	99e055da3c	[现场问题：111 检测项报表]	5 years ago
袁津哲	30610476b9	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	1caea6bf36	修改实体数字字段	5 years ago
qianhs	214fbb8da2	【1613 装车单新增中航打印格式】	5 years ago
袁津哲	d289a58439	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	db7d86acc1	修改实体数字字段默认值0，不允许为空	5 years ago
wynne1005	035e77c0ab	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	5d6588b5af	task `1565` 增加发运字段	5 years ago
陈思洁	03d2ee9246	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	244270684d	【泰国项目】	5 years ago
袁津哲	a5a8130388	修改不兼容sqlserver数据库查询语句	5 years ago
wynne1005	86713a01f2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	1051b22575	ICS 注册中心监控对象	5 years ago
joke.wang	4469d92344	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	f1baf4fdbe	[麦格纳问题：111 检测项报表]	5 years ago
宋军超	8109275630	添加散件BOM导入	5 years ago
宋军超	69b620336f	散件BOM导入	5 years ago
wynne1005	15c9e7111b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	ca85c59cdb	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
qianhs	20f5bfc9eb	wms数据同步迁移至mes	5 years ago
陈思洁	72563a4eb5	【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】	5 years ago
王杰	c6aefc89e7	test合并dev解决ct	5 years ago
王杰	94fed3b9b2	Merge branch 'test' into dev	5 years ago
陈思洁	59cbfbf293	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	08ec98305b	【1581 工位扫描-记录换模时间 -校验逻辑调整】	5 years ago
joke.wang	3e33a7ac3a	[客户jit增加JIT排序号字段]	5 years ago
王杰	b1018dbd39	[平台；]	5 years ago
袁津哲	1a74363541	优化实体字段	5 years ago
puxiao.liao	4b3923a64d	bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】	5 years ago
wynne1005	b5ecb91399	中航四月十号 内容提交	5 years ago
joke.wang	4e8c4ae46f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	caf8feb374	[采集工步存入生产数据格式修改]	5 years ago
joke.wang	11adb5ff09	[麦格纳问题：111 检测项数据报表]	5 years ago
钮海涛	05c1575e8f	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	01ae9caa8c	task:1496	5 years ago
alwaysfrin	f4e9a80d79	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
alwaysfrin	14660641ba	hibernate优化	5 years ago
wei.peng	fa42a25b96	异常处理优化	5 years ago
puxiao.liao	63c827d0de	bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】	5 years ago
joke.wang	1d50c135ac	[麦格纳问题：87 增加工单管理页面]	5 years ago
wei.peng	aa1f7a2845	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
曾贞一	3bea17f2d7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	b7e3aeef41	【8014 20011--报工记录表，查询数据重复---0415】 ... 【8015 20011--报工记录报表，增加两列显示】	5 years ago
钮海涛	4dee474c73	修改POM版本号	5 years ago
钮海涛	417120358c	Merge branch 'test' into dev	5 years ago
钮海涛	288fb4a16b	修改POM版本号	5 years ago
钮海涛	aff68cd087	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	cd810ce1fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	5a6c525d1f	【MES_生成条码模型增加时分秒字段】	5 years ago
王杰	e0a23b147e	mes enum	5 years ago
王杰	3f3d0038e8	【任务：1608 数据监听预警配置，定时任务】	5 years ago
qianhs	2e85d99380	联调测试	5 years ago
wynne1005	dbba31670d	增加条码生产	5 years ago
许心洁	4884f59072	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2bc62e2444	动态查询：#需求变更 创建用户和更新用户也需要做成可选的	5 years ago
wynne1005	17f6ac6609	删除重复字段	5 years ago
wynne1005	07d8e12216	commit stationrequestbean	5 years ago
wynne1005	2e177ba671	dev合并test test有修改	5 years ago
汪云昊	2772ea6a2f	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/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-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
汪云昊	8a8c3ee34d	pom版本调整	5 years ago
wynne1005	763d72b128	dev合并麦格纳的test	5 years ago
puxiao.liao	b8701bc398	Merge remote-tracking branch 'origin/test' into test	5 years ago
puxiao.liao	7062e7a383	bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】	5 years ago
joke.wang	14bb71f9f2	[料架条码打印查询修改]	5 years ago
wynne1005	581d900123	状态机model提交	5 years ago
qianhs	ba4b450437	联调测试	5 years ago
wynne1005	12e31f630b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	ba90a50621	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	8c635c3557	联调测试	5 years ago
qianhs	7244fb38b1	联调测试	5 years ago
wynne1005	f8e0f5e37e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	e289414363	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	46e0f502d0	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
曾贞一	a59a5e532e	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
曾贞一	35023af12c	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
汪云昊	e7d176209e	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	64d83d238f	Merge branch 'dev' of wei.peng/i3plus-pojo into dev	5 years ago
汪云昊	b4f14112b3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	3fd17208e2	枚举更新	5 years ago
袁津哲	94f25541aa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	4dc2996bdc	业务类型实体中新增是否启用波次字段	5 years ago
宋军超	b3032ca8e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	45dda6ea57	添加散件配置报文关系和工装明细实体	5 years ago
袁津哲	cbe3094f2a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	ea9457a191	修复WMS波次计划实体类字段	5 years ago
钮海涛	cfd3f8d58f	冲突解决	5 years ago
钮海涛	1d16e2d938	解决合并冲突	5 years ago
陈思洁	30608f886b	解决冲突	5 years ago
陈思洁	d9d2113f75	【MES_增加枚举】	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	53dc57a03e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	df1cbc9449	新增供货追踪接口	5 years ago
qianhs	836a4f710d	联调测试	5 years ago
宋军超	b3cecc9481	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	f64a543a4a	添加产品流程批量配置功能	5 years ago
袁津哲	bcec12cb38	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3442fd4801	波次规则明细新增开窗查询字段	5 years ago
袁津哲	9f918b6664	修改波次规则和范围枚举类字段值名称	5 years ago
王杰	cd99a63233	mes	5 years ago
汪云昊	0d75c1eac7	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
wynne1005	032fb350c8	queueordermodel添加构造函数	5 years ago
曾贞一	57f2177ef6	【波次合并规则--枚举查询错误】	5 years ago
袁津哲	ae1c6ef8fd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	8a836e340a	优化枚举查询报错问题	5 years ago
puxiao.liao	d2fb33d888	bug1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
puxiao.liao	053e81b861	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	a432b77ca0	任务1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
曾贞一	c0e3f1cb4f	【找回文件】	5 years ago
曾贞一	e84d74d7be	【冲突文件找回】	5 years ago
王杰	5fc4c6c025	mes	5 years ago
曾贞一	c926992611	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	4dae2eea7d	【MES 导入】	5 years ago
钮海涛	52a5c1e2f8	Merge branch 'test' into dev	5 years ago
qianhs	851bd1feec	联调测试	5 years ago
wynne1005	4324457b61	merge	5 years ago
wynne1005	dce52df770	组件传参给工步	5 years ago
qianhs	241ec4974b	联调测试	5 years ago
wynne1005	351ea8755e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6a36ad7601	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	1d00303306	自定义报表-折线图,饼图,柱状图,矩形图 完成	5 years ago
袁津哲	15035d2851	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3529d1b845	枚举类修改规则范围和规则值	5 years ago
钮海涛	8c4cb0748b	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
zcg	83d7a618bf	按钮组件model修改	5 years ago
zcg	9ab0d784dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	3654d60214	【bug7947】PLC监听工步装队列无法显示	5 years ago
汪云昊	2a80a4c720	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	aeda8d8287	版本调整	5 years ago
zcg	73f647e3b4	枚举修改	5 years ago
zcg	078e1a77a4	【bug 7895 PLC信息-页面需修改】	5 years ago
puxiao.liao	f8405b87d9	bug7940【7940 推荐入库-未按最近距离推荐】	5 years ago
汪云昊	3069c5bf18	查询条件补充	5 years ago
钮海涛	82d5332861	修复POM文件问题	5 years ago
钮海涛	3b987436d8	新增LES管理功能	5 years ago
钮海涛	c3a5564652	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
钮海涛	6925ce3b18	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
袁津哲	a8d84b1043	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	5de3c0bd7b	移库单模型中添加创建时间字段	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
joke.wang	05991b00d4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke.wang	1b0d0f8c6b	[任务：1576 动态按钮加载]	5 years ago
袁津哲	a4d32d6612	开发波次计划根据规则生成计划功能	5 years ago
袁津哲	cb8a090aea	开发波次计划功能	5 years ago
袁津哲	ffbd512b89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	14cfa5fa47	创建波次计划规则实体类和规则明细实体类	5 years ago
wynne1005	d1ff70adc4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
zcg	75832427e8	【task 1539 工位扫描-按钮组件结构搭建】	5 years ago
曾贞一	bcb8dee045	【1558 生产工单管理-泰国需求】	5 years ago
wynne1005	3c08e7794f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	eed24e0297	统一修改pom文件的项目版本问题	5 years ago
汪云昊	6ed34b9e5f	FTP服务端工具	5 years ago
汪云昊	b8abed43ca	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a32d4b3b00	资源模块化 ... 资源工具类优化	5 years ago
qianhs	3b763b45cd	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
joke.wang	4cb3d89ad6	[bug: 7637 生产数据ees查询修改]	5 years ago
wei.peng	02b5fc715a	添加对象序列化	5 years ago
陈思洁	ee0c342cac	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	6e1961c9d8	【mes_增加工位BOM表中的匹配类型枚举】	5 years ago
钮海涛	c37809d5b7	合并源仓库的修改	5 years ago
puxiao.liao	9dea4f1206	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	a887aa1236	1454 基于责任区域和班次的任务推送	5 years ago
wei.peng	c8c7c73336	自定义报表 布局,元素,报表 功能优化完成	5 years ago
钮海涛	d98e84759c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	f345ed2b2f	Merge branch 'dev' into test	5 years ago
wynne1005	286d605f09	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
陈思洁	f14f26a176	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5e2c592bbd	【IOT测试修改】	5 years ago
曾贞一	1cf4943751	冲突解决	5 years ago
曾贞一	70ff1763b8	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml	5 years ago
王杰	0502f6d736	【任务：1529，料架分组队列展示组件】	5 years ago
puxiao.liao	bf427bbb31	bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】	5 years ago
陈思洁	35351607f8	【MES_半成品箱条码绑定】	5 years ago
joke.wang	7a6e9b9e21	[任务：1479 料架打印]	5 years ago
曾贞一	77d7ac18ad	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/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-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
wynne1005	2a619f69f8	将新pom提交到test	5 years ago
陈思洁	c4032b8ed5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	320969f2f0	【1527 半成品标签自动打印】	5 years ago
钮海涛	d8779f42fb	从dev拉取最新代码	5 years ago
廖普小	eb1c89e5e6	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
贾文涛	abf5d3eeb9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
puxiao.liao	b626989e63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
puxiao.liao	3a7d7a7924	bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】	5 years ago
曾贞一	58053f4972	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	56c1bf8c44	【7648 在发运界面增加一个打开单据按钮。】	5 years ago
钮海涛	cf0db5b8da	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
wynne1005	06551fdd66	还原pom	5 years ago
zcg	9ca3a819b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	4b4bf4e433	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	9d5567f4a6	Merge branch 'test' into dev	5 years ago
许心洁	a22d3d2333	动态查询：#任务1352(合并代码解决冲突)	5 years ago
许心洁	030f2948fb	动态查询：#任务1352	5 years ago
王杰	e3a9defdab	任务1528，生成并打印门锁标签	5 years ago
zcg	98787953ec	【MesPcnEnum 枚举修改】	5 years ago
wynne1005	6336ebd8e9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	8b750e6a76	修改生产数据类型	5 years ago
puxiao.liao	8273a93520	Merge remote-tracking branch 'upstream/test' into test	5 years ago
puxiao.liao	f2c41fc0a6	bug7800【7800 移库单导出时报错导出失败】	5 years ago
王杰	0ca8502751	任务：1518	5 years ago
袁津哲	01b685a4c8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	0c3d14a3f9	wms插件枚举新增按钮增强插件类型	5 years ago
王杰	f005489b61	ptl	5 years ago
王杰	a9a7d78bd5	解决冲突	5 years ago
joke.wang	9d55a2a8b3	[解决冲突1]	5 years ago
joke.wang	8b681af622	[解决冲突]	5 years ago
joke.wang	045dc01479	[任务：1479 料架条码打印]	5 years ago
王杰	f578311f55	数据复核	5 years ago
袁津哲	f3b7ae8bc5	优化WmsPDA插件实体，去掉本地文件夹维护	5 years ago
wei.peng	549f2ff797	授权拦截功能完成 .	5 years ago
袁津哲	ab794aab0b	开发WMS动态加载插件功能	5 years ago
袁津哲	35a4c9039a	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
袁津哲	2a0204ad99	开发WMS动态加载插件功能	5 years ago
qianhs	564ba1e116	【1472 工步-设备状态采集（原PLC采集【设备状态】）】	5 years ago
qianhs	c53999b0d2	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
曾贞一	99ecde38d2	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
曾贞一	a98f598acc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
曾贞一	10b5885ede	【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】	5 years ago
joke.wang	79788daf8b	pom 修改	5 years ago
zcg	74e4aa953b	【任务 1480 照片采集】	5 years ago
joke lin	62cee148cd	[bug: 7875 客户JIT生产工单]	5 years ago
钮海涛	9da6628884	Merge branch 'master' into test	5 years ago
陈思洁	cc207240b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	bacab3fb88	【MES_新增设备工装关系和工装操作记录pojo】	5 years ago
puxiao.liao	4c199ce8ba	任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】 ... 任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】	5 years ago
曾贞一	3d913456af	【7863 修改单据两步法操作后，单据条码明细直接变为已完成的问题】	5 years ago
宋军超	628b0ee081	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	1690c9567b	添加调用MES接口发送完成信号 和 根据主任务编号生成区域任务组件	5 years ago
王杰	9f8e51830e	mes enum	5 years ago
qianhs	8d18c61d63	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
joke lin	126440c976	[任务：1435 客户JIT导入]	5 years ago
陈思洁	736b292d83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	310bf49af6	【MES_校验是否换膜并推送换模信号 】	5 years ago
陈思洁	22788f1c44	还原POM文件TEST-DEV	5 years ago
宋军超	d094824c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	6bdf815329	区域组件调用参数实体添加(状态代码statusCode)字段	5 years ago
qianhs	a93882c881	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
许心洁	8178e90abd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5bf7133ff1	动态查询：BUG#7845；BUG#7676；BUG#7675	5 years ago
袁津哲	df21c218cd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	b08d20fdb6	开发WMS动态加载插件功能	5 years ago
王杰	f5e4bba761	ptlpcnenum	5 years ago
曾贞一	5291d5d13d	【7838 修改分组管理中的按钮名称】	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
袁津哲	c178540545	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
袁津哲	327af15040	开发WMS动态加载插件功能	5 years ago
qianhs	26bf62fbe7	设备状态采集工步	5 years ago
陈思洁	474bb995d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	608a1d1e51	ptl	5 years ago
汪云昊	41a39990f4	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
钮海涛	1eaacd1b28	Merge branch 'test' into dev	5 years ago
陈思洁	1a0000da40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	333ef54c80	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
钮海涛	2d5de4a29b	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
puxiao.liao	8a7c5fa1b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	e3b6f03dd8	北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】 ... 北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】 北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】 北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】 北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】 北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】	5 years ago
puxiao.liao	f5cd46f1f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	2da53135a8	bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】 ... bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】	5 years ago
王杰	7d743c2c7f	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
王杰	6cfc2c5501	ptl	5 years ago
陈思洁	b3e38170e6	【1440 PLC采集工步【生产数据】】	5 years ago
汪云昊	6293bf352d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	e90ea98d1f	解决冲突	5 years ago
luweihao	03f1c4fddf	修改生产数据结构	5 years ago
汪云昊	081db93d0d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	af4cb74392	Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
王杰	8881bafecf	ptl pcn	5 years ago
joke lin	3b928c6ddc	[bug: 7637 生产数据]	5 years ago
汪云昊	b0a4eccca4	禁用启用，软删	5 years ago
joke lin	e8f48bcb04	[bug: 7637 生产数据查询]	5 years ago
许心洁	313a0acfb8	test	5 years ago
王杰	b6a83fff5d	Merge branch 'dev' into test	5 years ago
王杰	0b8c3317b8	ptlpcn enum	5 years ago
zcg	3d28840bae	【新增枚举，pojo】	5 years ago
zcg	b28c092ade	【新增枚举】	5 years ago
王杰	9d23ec7720	Merge branch 'dev' into test	5 years ago
宋军超	8b9d8fd16d	添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体	5 years ago
许心洁	c214561f3b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	5b92cae5d1	3D仓库：联调优化+收货看板BUG#7308	5 years ago
puxiao.liao	9edfe18aec	【7565 收货分组功能要求。】bug7565	5 years ago
puxiao.liao	9ca00bee68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
luweihao	d1d52ce389	Merge branch 'dev' into test	5 years ago
luweihao	8148b1654f	补上mes枚举	5 years ago
luweihao	16879a4f20	Merge branch 'dev' into test	5 years ago
陆卫豪	a65350bbf8	Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
luweihao	b52bb02d73	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
zcg	416c2ceffc	【任务 1443 excel模板导入功能修改】	5 years ago
zcg	9388e3b4f2	【pojo 冲突提交】	5 years ago
puxiao.liao	0b1e812f7b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
luweihao	679319635a	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
陈思洁	4fec84f810	【PTL_PLC配置表增加字段】	5 years ago
陆卫豪	60ab731ffd	Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev	5 years ago
陆卫豪	d8d48bd913	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
joke lin	d4e1e854c5	[任务：1441 plc推送数据]	5 years ago
joke lin	5ec9c55784	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
qianhs	65572b34a0	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
王杰	999aae6fc0	解决冲突	5 years ago
王杰	78d7861b44	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev	5 years ago
王杰	4b8cd0da38	ptlpcn enum	5 years ago
wei.peng	262edb9fec	日志查询优化, Es Tool 添加 聚合函数	5 years ago
puxiao.liao	8f584f250b	【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 ... 】bug7633	5 years ago
puxiao.liao	be479c2e76	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	46273325d3	动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）	5 years ago
许心洁	8a98efa9a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eaed7962ab	动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ ... 3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）	5 years ago
zcg	bd82a0fba7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke lin	6b9b44995e	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
曾贞一	38f1bd3b01	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	c0ce05e07c	【7648 在发运界面增加一个打开单据按钮】	5 years ago
曾贞一	2625c2cb0f	【修改 TSET-pom.xml】	5 years ago
puxiao.liao	4c0b2a1961	【 7603 单个零件标签打印功能修改。 ... 】bug7603	5 years ago
joke lin	4823660070	[任务：1435 计划管理]	5 years ago
汪云昊	f2ccb20095	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a3ecc3132f	表单约束管理	5 years ago
王杰	80ca438ce3	test合并到dev解决pom冲突	5 years ago
王杰	d9e4ea8ea9	Merge branch 'test' into dev	5 years ago
王杰	8ace0c363d	ptl enum	5 years ago
宋军超	fd79008df6	ptl同步配置表添加是否区分工厂字段isIgnoreOrg	5 years ago
宋军超	d34f3b8215	2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中	5 years ago
钮海涛	669874cb9b	Merge branch 'dev' into test	5 years ago
许心洁	368986e9d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1d90195de6	3D仓库	5 years ago
曾贞一	5ebb5cbf20	【修改 TSET-pom.xml】	5 years ago
贾文涛	30722b130c	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	5 years ago
王杰	068a0956db	解决冲突	5 years ago
王杰	b77d3065a4	Merge branch 'test' into dev	5 years ago
曾贞一	0368152e71	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
曾贞一	4fcd7cbc3f	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
王杰	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