5641 Commits (30fcf4f23f10cbf2388a1446f1cc1c2c52e0e8d6)

Author	SHA1	Message	Date
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