5651 Commits (c1241bd6c5365db34b82f0c2e5123c1cef28753c)

Author	SHA1	Message	Date
jenkins	af9bb85377	Jenkins自动合并	6 years ago
WYnneaoapc	238d0aea3b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	efb29aa8f4	task `1294-1` 查找workcell的时候需要带上产线	6 years ago
钮海涛	222e1b020d	新增表达式录入界面接口	6 years ago
王杰	e636bfaa83	Merge branch 'test'	6 years ago
王杰	7ca0ac3e5a	解决冲突	6 years ago
王杰	bba25ad2de	批量打包model修改	6 years ago
E	c7d4253e5e	【bug 6872 - 收货、发运看板数据未加载】	6 years ago
jenkins	6fc8833b01	Jenkins自动合并	6 years ago
汪云昊	bc5beeba7d	添加适配记录索引	6 years ago
WYnneaoapc	9b8675c904	task `1292-1` 新增条码履历字段	6 years ago
jenkins	0349a43f71	Jenkins自动合并	6 years ago
于学杰	67b5069c48	1. 增加分组提交的配置字段	6 years ago
王杰	ad4b75bac9	Merge branch 'test'	6 years ago
王杰	8bb63e3bac	Merge branch 'dev' into test	6 years ago
王杰	1f4a8d6e55	【安灯修改枚举】	6 years ago
WYnneaoapc	ffb977ffc5	merge	6 years ago
jenkins	2c88a30b4d	Jenkins自动合并	6 years ago
WYnneaoapc	6852153227	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	8dc1513947	bug`6897` SOP信息-编辑图片后未显示出图片地址	6 years ago
jokelone	a337f1824f	Merge branch 'dev' into test	6 years ago
陈思洁	3a353b1539	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	1d5f4b38a4	【KT-1282 计划拉动-班次管理】	6 years ago
gcj	32dccc056c	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/sqlpack/WmsHqlPack.java	6 years ago
gcj	1e10bdee0c	【坤泰运输管理】	6 years ago
王杰	19a2f6661e	Merge branch 'test'	6 years ago
陆卫豪	345374354b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	fc5282342f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ca952d5211	bug`6866` 2 打印模板同步	6 years ago
jenkins	1e089c4110	Jenkins自动合并	6 years ago
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
陈思洁	eb5f9610a8	【KT-1282 计划拉动-班次管理】	6 years ago
jenkins	5bd51e2045	Jenkins自动合并	6 years ago
陈思洁	dc8a44df2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	5797ec4b1b	新增工位表字段	6 years ago
王杰	4e866d70e1	Merge branch 'dev' into test	6 years ago
王杰	fcc2b09559	【安灯修改枚举】	6 years ago
jenkins	6d1d66daf3	Jenkins自动合并	6 years ago
WYnneaoapc	f4b50200b2	bug`6866` 1 打印模板同步	6 years ago
jokelone	7e0d27f0f4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a0780669c3	【任务：1287】	6 years ago
zcg	032260b9f2	[需求：1290，导入excel]	6 years ago
jenkins	9d916c17d7	Jenkins自动合并	6 years ago
陈思洁	4f67cc1310	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	61f3465255	新增工位表字段	6 years ago
jenkins	a2947478ca	Jenkins自动合并	6 years ago
jokelone	178b30698c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	edcdeb3d4f	【任务：1287】	6 years ago
曾贞一	10d8b9626f	冲突解决	6 years ago
曾贞一	cb6fe137d1	【bug6863 生产入库时-如果判断该条码未报工】	6 years ago
jenkins	6ee5823e15	Jenkins自动合并	6 years ago
jokelone	917774921e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a6730b0cd8	【任务：1287产品类型图片】	6 years ago
WYnneaoapc	64267e19b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7069bc5cbb	task`1287`3` 新增文件表，原来业务与文件脱离	6 years ago
许心洁	49a126843b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	4fd9ec76f4	枚举漏提交	6 years ago
许心洁	2ce2f17353	流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化	6 years ago
王杰	2a10fd1021	【组织模型工厂加id】	6 years ago
钮海涛	57b3b4242e	新增表达式录入界面接口	6 years ago
jokelone	8c5eb8d7c5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	c42775389d	【任务：1273质量检测增加字段】	6 years ago
WYnneaoapc	2d7558e1ba	task`1287`2` 新增文件表，原来业务与文件脱离	6 years ago
WYnneaoapc	931eea704e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	93bc62b921	task`1287` 新增文件表，原来业务与文件脱离	6 years ago
汪云昊	f6d47519be	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	764a39a6a6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	8c872302a3	细节调整	6 years ago
WYnneaoapc	2cde398cca	Merge branch 'test'	6 years ago
陆卫豪	37f32d4269	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	f011aab765	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a4d38de535	【任务：1272代码优化】	6 years ago
jenkins	9fb017ce25	Jenkins自动合并	6 years ago
王杰	91730dd195	【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】	6 years ago
陆卫豪	448371a461	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	603cd76784	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	5b7f268b91	1274 修改组件普遍问题	6 years ago
jokelone	4025a0963b	【任务：1273质量检测增加检测项类型1】	6 years ago
jokelone	d835ef1bb5	【任务：1273质量检测标准增加检测项类型】	6 years ago
jokelone	a579358968	【任务：1257下线时间】	6 years ago
jenkins	4b6db8cd91	Jenkins自动合并	6 years ago
钮海涛	5e8e05ddb4	新增表达式录入界面接口	6 years ago
jenkins	cbbb9644a0	Jenkins自动合并	6 years ago
E	686cd3dbfa	【#1240 KT-发运看板】前端对接调整	6 years ago
jokelone	690918add5	Merge branch 'dev' into test	6 years ago
曾贞一	1c9f605c56	【VDA成品发运配料-客户发往地】	6 years ago
jenkins	de173e8500	Jenkins自动合并	6 years ago
曾贞一	594d6a4135	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	935ca2f4d7	【任务：1211报表】	6 years ago
王杰	3df5888a69	更新 'modules/i3plus-pojo-workflow/pom.xml'	6 years ago
王杰	a254841385	更新 'modules/i3plus-pojo-wms/pom.xml'	6 years ago
王杰	ea8f527309	更新 'modules/i3plus-pojo-sweb/pom.xml'	6 years ago
王杰	be04366551	更新 'modules/i3plus-pojo-softswitch/pom.xml'	6 years ago
王杰	b2210e7425	更新 'modules/i3plus-pojo-report/pom.xml'	6 years ago
王杰	711116d041	更新 'modules/i3plus-pojo-platform/pom.xml'	6 years ago
王杰	4911d184e0	更新 'modules/i3plus-pojo-model/pom.xml'	6 years ago
王杰	5b672e7d68	更新 'modules/i3plus-pojo-mes-pcn/pom.xml'	6 years ago
王杰	b703c9394c	更新 'modules/i3plus-pojo-mes/pom.xml'	6 years ago
王杰	e09345984d	更新 'modules/i3plus-pojo-lac/pom.xml'	6 years ago
王杰	071c218a2e	更新 'modules/i3plus-pojo-jobflow/pom.xml'	6 years ago
王杰	fda76e06c8	更新 'modules/i3plus-pojo-hardswitch/pom.xml'	6 years ago
王杰	f8356637ae	更新 'modules/i3plus-pojo-form/pom.xml'	6 years ago
王杰	5d57bc44d8	更新 'modules/i3plus-pojo-base/pom.xml'	6 years ago
王杰	e43d593db6	更新 'modules/i3plus-pojo-aps/pom.xml'	6 years ago
王杰	d62aec1c62	更新 'modules/i3plus-pojo-andon/pom.xml'	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago
王杰	b9906cee55	增加枚举	6 years ago
puxiao.liao	e580dcbd2d	【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663	6 years ago
曾贞一	892d63b9b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	dd36a0b053	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	ca71303bee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	82e8df0af8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gcj	b6ae28c957	【采购收货】	6 years ago
jenkins	d2591b419b	Jenkins自动合并	6 years ago
许心洁	e4348cd334	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	fa8a88c6d0	流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中	6 years ago
陆卫豪	93126de988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	1d0c03ba9c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
E	831daa4964	【#1241 KT-收货看板-增加道口】	6 years ago
gcj	a35171a41d	【采购收货】	6 years ago
jenkins	f9d508d1ef	Jenkins自动合并	6 years ago
qianhs	402b09e82e	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
王杰	338367f3c3	Merge branch 'dev' into test	6 years ago
jokelone	6cf0ab98f6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	7004ad0971	【任务：1211报表质量数据导出】	6 years ago
曾贞一	bb92161133	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	64bfbb5013	新增甘特图工作块连线功能	6 years ago
jenkins	7630541146	Jenkins自动合并	6 years ago
jokelone	0e2b13d52f	【任务：1258枚举优化】	6 years ago
王杰	52f4854621	Merge branch 'dev' into test	6 years ago
jokelone	60e4e1a7f3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	3c9183e422	【任务：1256工序BOM改为工位BOM】	6 years ago
王杰	99b66e459d	【需求：1221，导入】	6 years ago
钮海涛	04009f02e0	新增数据校验功能	6 years ago
陆卫豪	2aca595bad	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	7a379fb5ab	【任务：1211报表质量数据首检导出】	6 years ago
jenkins	33f3fd0963	Jenkins自动合并	6 years ago
qianhs	c8f23ba640	【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	91ec41b3c0	暂时注解掉索引信息。	6 years ago
WYnneaoapc	1313916b81	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	55b07e8e75	1256 工序bom改为工位bom	6 years ago
王杰	8cba58d339	Merge branch 'dev'	6 years ago
曾贞一	793535e74c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8892c78692	【EU成品发运-客户编号】	6 years ago
王杰	5dd94058cf	Merge branch 'dev' into test	6 years ago
王杰	f038ed7234	增加枚举	6 years ago
jenkins	f4988f68f7	Jenkins自动合并	6 years ago
puxiao.liao	7df617b290	【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651	6 years ago
jenkins	66c59fb8ff	Jenkins自动合并	6 years ago
crish	9027b22af8	Merge branch 'dev'	6 years ago
WYnneaoapc	d05a858bd1	6565 修改fastdfs配置，工位监控显示完成数量	6 years ago
jenkins	ad6d4f5034	Jenkins自动合并	6 years ago
陈思洁	14f509b97a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	42d1a461a4	新增附件信息表	6 years ago
钮海涛	d819f7b6c7	修复报表分页问题	6 years ago
jenkins	66252032b3	Jenkins自动合并	6 years ago
陈思洁	9cb03c8661	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c6ff8f109c	新增附件信息表	6 years ago
王杰	be39fb2abe	Merge branch 'dev' into test	6 years ago
jokelone	ff69583e8d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	19c0c1deb5	【任务：1211报表】	6 years ago
汪云昊	56381b76f1	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	db019bf4eb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jenkins	d44d5d79ab	Jenkins自动合并	6 years ago
汪云昊	26e7f975bf	数据源适配器支持IN	6 years ago
钮海涛	0dddbb936c	新增报表接口	6 years ago
jenkins	6d9a2b5b80	2019年11月27日12:14:44	6 years ago
wei.peng	84d341aa87	Jenkins 自动合并代码测试	6 years ago
汪云昊	f5a0f24355	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	a0f1eab0f9	Jenkins 自动合并代码测试	6 years ago
汪云昊	f2c0c1206a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	ad0389fb13	JOB日志优化	6 years ago
汪云昊	3faa679cf9	Job测试 ... 新增资源初始化方式（导入，导出） 异常日志持久化bug OPC服务 MQ管理接口	6 years ago
王杰	6da48220a5	Merge branch 'dev' into test	6 years ago
王杰	3aa69e0262	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	6959d126a0	增加枚举	6 years ago
puxiao.liao	1d66ce2612	【VDA推荐入库-入库成功-无引导信息】bug6645	6 years ago
crish	cba2cda2d4	安灯主界面部分字段赋初始值	6 years ago
crish	376700de0d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	06e969af1b	安灯主界面	6 years ago
钮海涛	d4f963ee70	新增报表接口	6 years ago
jenkins	c8b0c49b57	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	544944d31c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	d0e6d30a9e	#6639 【VDA生产领料-FIFO跳过-系统异常】	6 years ago
gcj	e827462426	【采购收货】	6 years ago
crish	74224b20ac	安灯主界面开发	6 years ago
WYnneaoapc	9306945691	Merge branch 'test'	6 years ago
陆卫豪	7556ada2d4	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	9e64ee8258	【需求：1221，导入】	6 years ago
jenkins	8a34eee5c5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	a49fdf87b8	【任务：1211报表质量数据】	6 years ago
陈思洁	42a6f8a02d	【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】	6 years ago
陈思洁	d5ff3e4ce1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	54d3e351be	合并冲突	6 years ago
WYnneaoapc	ec49074a8b	Merge branch 'test'	6 years ago
陆卫豪	5af777c4fd	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	b69bd1ae53	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ed89db8be3	6565 更新 同步流程	6 years ago
jenkins	dcd36cb6e5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
gcj	af1324e9c7	【采购收货】	6 years ago
wei.peng	6d5fc7ab39	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	25cbbb5837	雪花ID 生成器 改为prop 配置	6 years ago
许心洁	e5767574fe	任务明细POJO添加交易类型代码字段：唯一索引	6 years ago
王杰	73b1e827d6	Merge branch 'dev' into test	6 years ago
王杰	1ab2c3605a	【需求：1221，导入】	6 years ago
gcj	87dd679d47	【采购收货】	6 years ago
许心洁	151a7d65c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	48e136c4aa	任务列表展示创建人	6 years ago
王杰	e9055e3c5d	Merge branch 'dev' into test	6 years ago
王杰	2893d13e9f	需求1221，导入	6 years ago
WYnneaoapc	30aa0bb099	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c770dda7b2	问题修改 6283	6 years ago
许心洁	e37653c544	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	214b3a07b7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f39e16511f	给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常	6 years ago
jenkins	5947429d54	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	8d15084b20	1. 调整5个批次的名称	6 years ago
jenkins	68b650ab81	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	8447ef39c9	【采购收货】	6 years ago
jenkins	870dc7007d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	acbbbf8e32	【采购收货】	6 years ago
jokelone	902ef5b177	【bug：6577缺陷获取字段修改】	6 years ago
jenkins	f6506bdd0b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
曾贞一	ca6b596b14	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	47ccfcc9e3	【EU成品发运-检查数量组件】【bug1177】 ... 【EU成品发运-检查单据是否操作完成组件】【bug1176】 【EU成品发运-成品发运FIFO推荐组件】【bug1174】	6 years ago
王杰	1d920627ec	Merge branch 'dev' into test	6 years ago
wei.peng	7893bcd77e	功能菜单国际化 完成	6 years ago
jokelone	0e9f13ff82	【bug：6582报废原因增加报废类型】	6 years ago
jokelone	e754cb9053	【优化：27班组增加产线、班长字段】	6 years ago
jokelone	8a806815a5	【任务：1193qty数量类型更改为Double】	6 years ago
jokelone	327e4dcd64	【优化：27班组增加产线、班长字段】	6 years ago
钮海涛	5f3f973c3e	新增报表接口	6 years ago
王杰	a41c00f129	Merge branch 'dev' into test	6 years ago
王杰	4146126284	【需求：1202，条码补打】	6 years ago
jokelone	515a3c5dec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	5bc9b9b082	【任务：1193字段类型修改】	6 years ago
jenkins	2f6400dc78	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	f1cfe26378	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	7452d49930	【采购收货】	6 years ago
王杰	dd0304d713	Merge branch 'dev' into test	6 years ago
王杰	7d623560b6	【需求：1202，条码补打】	6 years ago
jokelone	3eda200854	【bug：6545类型信息增加枚举】	6 years ago
王杰	09cf450156	Merge branch 'dev' into test	6 years ago
王杰	ca57c0342a	【需求：1202，条码补打】	6 years ago
汪云昊	f7d6fd4ae1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jenkins	ddee8a5215	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	314aa78336	【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】	6 years ago
crish	852083f667	Merge branch 'test'	6 years ago
crish	4d3adf5daf	Merge branch 'dev' into test	6 years ago
汪云昊	c39324648e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	04c6946271	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	b2b16e2017	安灯工位分组配置	6 years ago
汪云昊	f0e77305dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	3856a6d600	LAC调整微服务指令集操作方式 ... OPC UA工具订阅方式调整	6 years ago
曾贞一	07f51040c3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ff1f561b9d	消息样式实体类 增加一条	6 years ago
1111	f0290a758d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
1111	e349ab3e9b	【采购收货】	6 years ago
王杰	4f87ec8516	解决冲突	6 years ago
wei.peng	6cb9eeed8c	功能权限 倒入导出 添加产品类型校验	6 years ago
wei.peng	11bc240347	功能权限国际完成	6 years ago
jokelone	07ee1971ae	【bug：6522工位增加序号字段】	6 years ago
crish	54ae351d91	安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑	6 years ago
qinjia zou	f7c89fa6b1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
qinjia zou	c051b6024b	【VDA物流路线-路线新增-字段赋值】bug6515	6 years ago
jokelone	869278c614	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	c5bc44f29a	【bug：6522工位增加序号字段】	6 years ago
钮海涛	f640f97116	修复副资源排程Bug	6 years ago
钮海涛	f969ab4599	修复副资源排程Bug	6 years ago
WYnneaoapc	81873315c3	Merge branch 'test'	6 years ago
crish	55ee26db3c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	f836daf8a6	将广播设备写死的代码配置化	6 years ago
陆卫豪	62800f757e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	185b40a586	6518 管控代码修改	6 years ago
钮海涛	bed955575d	修复规则组合关联问题	6 years ago
jokelone	ce63c161be	【任务：1211报表功能开发：生产报表】	6 years ago
jenkins	04ae04246e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	549f63aa0d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	07bda76d4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	b181cf2ac3	【安全库存拉动】	6 years ago
许心洁	77b921ef38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b0c4d11000	流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）	6 years ago
crish	86171d35b7	修改master分支pom为PROD	6 years ago
crish	2469e13e95	pom文件修改为PROD	6 years ago
jenkins	edc281dffe	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qinjia zou	51d70654ef	【欧洲-生产快速入库】bug6389	6 years ago
王杰	ac5432bebb	解决冲突	6 years ago
王杰	71d39f54d2	Merge branch 'dev' into test	6 years ago
王杰	c595d3f6b1	修改字段	6 years ago
陆卫豪	d6ff7aa2b1	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	492367670b	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	59d6eb0727	添加系统配置接口	6 years ago
王杰	5943854c5b	增加字段	6 years ago
jokelone	054502b657	【任务：1193接口调试】	6 years ago
钮海涛	695ab094d2	修复资源表多选枚举显示问题。	6 years ago
钮海涛	89943f6586	修复资源表多选枚举显示问题。	6 years ago
qinjia zou	7a134dc0cb	【欧洲-生产快速入库】bug6389	6 years ago
jenkins	8eb8c2f97e	Merge branch 'master' of i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	7b47c7b942	修复关联对象字段显示问题	6 years ago
王杰	9f9c095846	Merge branch 'dev' into test	6 years ago
WYnneaoapc	4441d1dc86	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
WYnneaoapc	88d480403c	数据库字段初始化属性 赋值longtext	6 years ago
crish	92c1e846b6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	c4ed0f1f37	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	12ba5d2ff3	lac微服务模式优化	6 years ago
1111	e0a5b36061	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
许心洁	b88a879c58	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
jenkins	603004c190	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	1720952d23	修复自定义字段表达式取值问题	6 years ago
crish	3645541765	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	d35c6e97cd	【采购收货】	6 years ago
王杰	a595fed4fe	Merge branch 'test'	6 years ago
王杰	9baac06cb7	Merge branch 'dev' into test	6 years ago
王杰	e91369c82a	【需求：1198】	6 years ago
陆卫豪	0fad1e4df5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	23b3ae88e5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	0e9b9b26fd	包装打印逻辑修改	6 years ago
jenkins	e7bad502c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	96ea008725	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c0d8375d0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
1111	41a48b4b59	【采购收货】 采购收货	6 years ago
许心洁	8d6a2b53b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b7c6189308	生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）	6 years ago
jenkins	4be5d5e1aa	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	8f07751100	LAC 日志记录查询完成	6 years ago
汪云昊	c60213ad3e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	2ad6d16684	参数重复校验错误	6 years ago
qianhs	d4422bee15	【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】	6 years ago
王杰	7a023d0f4b	Merge branch 'dev' into test	6 years ago
王杰	fe962c1ab3	【bug:6483】	6 years ago
王杰	3c3de49512	【bug:6483】	6 years ago
crish	6c07f29317	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	407fdbf217	修复对象关联删除出错问题	6 years ago
王杰	64d631c180	Merge branch 'test'	6 years ago
王杰	e5db689881	Merge branch 'dev' into test	6 years ago
王杰	85e35eede1	解决冲突	6 years ago
汪云昊	f95482501b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	efea8980e7	解除冲突	6 years ago
汪云昊	5a2a2a5e8d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java	6 years ago
jenkins	092f72872b	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	4b17995206	LAC 日志记录Cache 完成	6 years ago
王杰	7f08847c50	Merge branch 'test'	6 years ago
王杰	6297ccc4d7	Merge branch 'dev' into test	6 years ago
jokelone	5e813f30e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	f632308d0a	【任务：1193接口数据解析】	6 years ago
王杰	2a5c32b8ea	解决冲突	6 years ago
陈思洁	5050c0c5a1	新增实体--安全库存	6 years ago
qinjia zou	2210482918	【自动入库】bug6390	6 years ago
汪云昊	13f77e69c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	02a9c64a42	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
qinjia zou	a8ebcb669b	【自动入库】bug6390	6 years ago
qinjia zou	6e8977e5aa	【自动入库】bug6390	6 years ago
钮海涛	e3ba4f6349	新增规则组合执行接口	6 years ago
jokelone	e046553788	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	987a502d7e	【bug：6380 物料字段拼写有误】	6 years ago
陆卫豪	4a76c480ac	Merge branch 'test' of i3-IMPP/i3plus-pojo into master	6 years ago
陆卫豪	82fd56dc68	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	12a66262be	解决冲突	6 years ago
WYnneaoapc	fdd051f2dd	打印修复	6 years ago
jenkins	f76aaddbd5	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	a55795d43f	【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
许心洁	3559962ccb	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
qianhs	f0b35d1d74	【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 ... 【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】 【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】	6 years ago
jenkins	4d2a2a35b0	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	339a12eba3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	3781713a29	实时库存-条码明细优化查询速度	6 years ago
于学杰	9e625acc0d	1. MOVE_TO_ERP 增加是否预收货字段	6 years ago
曾贞一	3ba4e9b4f1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	28078287af	【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】	6 years ago
王杰	f6d50bdfb7	【需求：1167，产品批量打包】	6 years ago
王杰	693ac2451e	【需求：1167，产品批量打包】	6 years ago
于学杰	71818c4745	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	db9a698c68	1. 增加是否寄售的属性	6 years ago
jokelone	4cec8e8ac8	【任务：1193接口物料拆解增加工位字段】	6 years ago
汪云昊	b4976be85e	LAC执行流程调试 ... UA订阅次数问题	6 years ago
王杰	1a7164c474	Merge branch 'dev' into test	6 years ago
王杰	b15c3f4ae7	【需求：1101，定时任务优化】	6 years ago
jokelone	9ca2760866	【任务：1193接口repository】/s	6 years ago
jokelone	9842ed2181	【任务：1193接口pojo】	6 years ago
王杰	e60256e291	【需求：1167，包装特殊批次工步】	6 years ago
qianhs	48cbf9d471	【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】 ... 【 库存报表中无法看到寄售零件】【bug6331】	6 years ago
puxiao.liao	3bda3169f4	【超级移库】bug6295	6 years ago
钮海涛	9597cee596	修复删除对象Bug，关联没有删除问题	6 years ago
王杰	57253ea87b	Merge branch 'dev' into test	6 years ago
puxiao.liao	a441633326	【超级移库】bug6295	6 years ago
crish	5b6b303722	Merge branch 'test'	6 years ago
crish	17d5f1e512	Merge branch 'dev' into test	6 years ago
crish	70683025db	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	97958262b6	查询条件优化	6 years ago
王杰	2660e0268e	【需求：1198，代码优化】	6 years ago
crish	410558d43c	Merge branch 'test'	6 years ago
汪云昊	7cb9ffd37b	Lac细节优化 ... OPC调整	6 years ago
曾贞一	0b9587586d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	7dbb55bcb0	【VDA质检】【缺了检验条码数量是否为-bug6402】	6 years ago
陆卫豪	95d8dbb908	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	7ba63dc9a8	6283 打包扫描	6 years ago
jenkins	b5685a7874	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	c27daae8e4	移动单条码表 --供应商编码	6 years ago
陈思洁	6de87a1581	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9969916e0a	开口合同 -关联单据类型	6 years ago
许心洁	3005beda46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	0e1220c329	Core 服务 用户查询优化	6 years ago
许心洁	4ad645d34e	流程管家新增触发源（放大镜80）+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件	6 years ago
王杰	9137555226	Merge branch 'dev' into test	6 years ago
王杰	028d7641d2	【需求：1126，设备周期计划优化】	6 years ago
crish	6567b30178	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	ad6baaa1e6	安灯通知方式调试， 日志调试	6 years ago
钮海涛	58b0f4a531	新增BOM树信息获取接口	6 years ago
puxiao.liao	21375ed6f4	【超级移库】bug6295	6 years ago
陆卫豪	3fa5437c5a	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	37e288ff77	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java	6 years ago
WYnneaoapc	360f908ae4	获取生产数据 6283	6 years ago
jenkins	3d8421e1ec	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
于学杰	c3441184c0	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	6 years ago
汪云昊	8ff5d888c2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	aab18be0e6	Lac细节优化 ... OPC调整	6 years ago
qianhs	137e473543	【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】	6 years ago
王杰	da0478ec7e	Merge branch 'dev' into test	6 years ago
王杰	ebb59cbb64	【需求:1167,批量打包】	6 years ago
于学杰	b80a5b21ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	bcc7c282ca	1. 增加质检单生成类型	6 years ago
王杰	093008fae8	Merge branch 'dev' into test	6 years ago
jokelone	616d39fa38	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	246726a67d	【任务：1193 接口基础数据】	6 years ago
jenkins	c1b50db526	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	49637cb23f	【需求:1167,批量打包】	6 years ago
汪云昊	d23303f07b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	1f85c75f6c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
puxiao.liao	9b8d4c900b	【事物查询】bug6294	6 years ago
1111	60ec41e149	【采购收货】	6 years ago
1111	4063929c34	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	6 years ago
jenkins	a7b751d9dc	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
1111	2077c651e7	【采购收货】	6 years ago
crish	4bd4ca8745	通知方式， 通知内容	6 years ago
WYnneaoapc	c1c00213e1	工位监控修改 6283	6 years ago
汪云昊	423d8d2c03	日志开关 ... lac优化 OPC UA工具类	6 years ago
crish	835ea47ba2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	a30f4aae83	andon广播音量可配置， 安灯通知记录	6 years ago
jokelone	3eeaff50b3	【bug：5957工厂初始化】	6 years ago
puxiao.liao	75701682d2	【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】	6 years ago
许心洁	838b7ac311	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	cce413945d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	c1476f83c0	关闭任务	6 years ago
许心洁	003ed70f98	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	ee51d54030	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	aa22d18645	添加注解	6 years ago
crish	577b2c462a	按照安灯类型统计当天发生的安灯总次数和安灯超时次数	6 years ago
WYnneaoapc	b595d76056	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	45d14fe3e2	枚举增加 生产模式参数 6823	6 years ago
许心洁	ed7e002f6d	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	7678b95aaa	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	a294c1ccb0	安灯看板超时统计功能	6 years ago
qianhs	6536109b66	【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】	6 years ago
王杰	71bde083a3	Merge branch 'dev' into test	6 years ago
陈思洁	508618baf6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	9b491b742e	业务类型枚举维护	6 years ago
许心洁	60c25d7a71	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
许心洁	738aa2d08c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	e2249ea8dd	【需求：1189，产品条码工步】	6 years ago
许心洁	ccb29c5903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	3425b443c8	工位监控优化 6283	6 years ago
1111	f3cb409ca6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	2f2c843006	【坤泰-采购收货】包装关系	6 years ago
王杰	f5c8e36ac9	【需求：1189，产品条码工步】	6 years ago
王杰	649ffb548d	Merge branch 'dev' into test	6 years ago
王杰	e30ba280e0	解决冲突	6 years ago
王杰	bcf3866ca6	Merge branch 'dev' into test	6 years ago
王杰	5142191f55	解决冲突	6 years ago
许心洁	208410340e	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
qianhs	1453a3d49b	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
王杰	ab34ebb769	Merge branch 'dev' into test	6 years ago
陈思洁	3b235acda0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	31e24390dd	合并冲突	6 years ago
WYnneaoapc	c93dd66cd9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7b88c605ba	枚举修改 1060	6 years ago
陈思洁	99947f284e	枚举修改--移动业务类型	6 years ago
qianhs	62bb71f4b0	【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】	6 years ago
许心洁	6d9787dc65	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lpx	94dc90172d	【扫描查询】bug6246	6 years ago
张哲铭	578be0650a	Merge branch 'dev' into test	6 years ago
wei.peng	43e400d354	数据映射类型 更改BigDecimal	6 years ago
1111	db952282e0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	7378df1b9e	【宁德问题清单】	6 years ago
许心洁	b6e27c33c8	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	a04b8f7c57	【bug：5791 生产工单明细1】	6 years ago
jokelone	5fd619ac79	【bug：5791生产工单明细】	6 years ago
王杰	75e7aa30c2	Merge branch 'dev' into test	6 years ago
王杰	84bf5ba64a	【需求：1162，pcn登陆】	6 years ago
陈思洁	04e876250b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	58c9795b7c	移动类型、业务类型维护数据	6 years ago
王杰	acaacf63a3	Merge branch 'dev' into test	6 years ago
WYnneaoapc	b4cea27a5b	代码审核 修改2	6 years ago
WYnneaoapc	56e6cf7918	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/MesEnumUtil.java	6 years ago
张哲铭	6871e96496	Merge branch 'dev' into test	6 years ago
1111	88a69ac7f8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
1111	71c867dd8c	【包装规格】	6 years ago
许心洁	ac43296df3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5dc8ffb394	日志处理队列V1.0	6 years ago
张哲铭	8e19f4dde3	Merge branch 'dev' into test	6 years ago
钮海涛	8e614bcb72	1:增加多选枚举的功能。	6 years ago
钮海涛	6be9a55983	1:增加多选枚举的功能。	6 years ago
钮海涛	f85dd4cbe5	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	bc14fcf027	Merge branch 'dev' into test	6 years ago
汪云昊	eeebbfd1fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
alwaysfrin	759f9ee819	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	e26dadca01	【需求：1162，pcn登陆】	6 years ago
汪云昊	dcbb6a7a1c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	053b3ae0e4	LAC 前端联调调整	6 years ago
alwaysfrin	da582b871d	日志处理优化	6 years ago
crish	c4d7a2380c	Merge branch 'test'	6 years ago
jokelone	755e920513	【bug：6250 返工返修拆解优化】	6 years ago
张哲铭	efbe0dfce9	Merge remote-tracking branch 'origin/dev' into test	6 years ago
lpx	fc49ddeea5	【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】	6 years ago
lpx	fc79b1b0f3	【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】	6 years ago
王杰	aa2f514f6c	Merge branch 'dev' into test	6 years ago
WYnneaoapc	029c9b6bc8	代码审核 修改1	6 years ago
王杰	980ae89cdf	【需求id：1162，pcn登陆】	6 years ago
许心洁	970105ac19	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	b6d7156b0b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	9a6c5cfda3	【任务：1163客户订单】	6 years ago
王杰	b2886012a5	【需求id：1162，pcn登陆】	6 years ago
许心洁	e433915759	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	c68cb7889e	【VDA物料拆分-输入数量-数量检验】【6233】	6 years ago
钮海涛	bd834a24cb	1:增加资源甘特图获取数据接口	6 years ago
曾贞一	c2d3e044fb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	be75c4ec42	【VDA质检--物料信息维护】任务号1135 ... 【VDA质检--检查数量组件--修改】任务号1134 【VDA质检--检查质检箱数组件】任务号1133	6 years ago
陆卫豪	64be0c721c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	4b47ceb42d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	3b447fa77a	数据抽取修改 1130	6 years ago
jokelone	bdce8a7103	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	9418a0838b	【任务：1129 产品编码配置基础数据】	6 years ago
许心洁	017cd18950	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	64cda23c12	1:增加资源甘特图获取数据接口	6 years ago
曾贞一	d428aa302d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	b7071bd0db	供应商字段 添加	6 years ago
crish	87d9b5c6ec	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	1a7fda268b	andon 系统配置	6 years ago
许心洁	9755e5f751	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	809e23aad7	1:修复启动时从数据库加载数据时的Bug。	6 years ago
钮海涛	7aa078e7ce	1:修复未设置基准时间的Bug	6 years ago
wei.peng	da7ba77dab	LAC 跨服务调用软适配接口完成	6 years ago
陆卫豪	46fc5f5750	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	a6e8265e29	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
jokelone	90ec0f107e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	32dbaed8fe	【任务：1129数据对象、对象结构、产品包装关系基础数据】	6 years ago
WYnneaoapc	4308084ca3	数据抽取修改 1130	6 years ago
王杰	d2c7a81893	Merge branch 'dev' into test	6 years ago
陈思洁	d69e863959	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3ef115bbe2	新增冗余字段	6 years ago
汪云昊	23f0503454	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1215a5c658	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	855cc46448	数据抽取修改 1116	6 years ago
wei.peng	0ba20f0094	LAC 日志查询接口功能完成	6 years ago
陆卫豪	07a80e7fd2	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	46e0488d5a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1de5b8b196	数据抽取修改 1116	6 years ago
wei.peng	0d777d1894	LAC 日志处理功能完成	6 years ago
crish	851ba63e7c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	f111febd8d	修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法	6 years ago
wei.peng	3645368544	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	b963bcb502	LAC 日志处理功能完成	6 years ago
汪云昊	dd0de76d4d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	219bf6db9a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
qianhs	457e10bc75	1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】	6 years ago
许心洁	04453aa706	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
gaochangjiang	d0165fd342	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	2414993cf9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	777060450e	新增字段--目标库位	6 years ago
gaochangjiang	047b9d5e35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
gaochangjiang	02e3ac4960	【库存预警】bug 修复库存预警	6 years ago
汪云昊	25425822a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	154bba4b3b	LAC 调度模式优化	6 years ago
WYnneaoapc	7f9f9cb242	返工返修pojo字段更改 1092	6 years ago
陆卫豪	576f02f75d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	9ad66157a8	数据同步优化 1078-4	6 years ago
钮海涛	2c47556abf	1：新增工作计划资源位置插入逻辑	6 years ago
jokelone	93438e1bdb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	21087d5d4d	【需求：1092 工序BOM和物料绑定记录模板增加构造方法】	6 years ago
王杰	2417b40635	Merge branch 'dev' into test	6 years ago
钮海涛	921be6b0f2	1：新增工作计划资源位置插入逻辑	6 years ago
汪云昊	ba7c713b6f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	cfd7f5276e	实体调整	6 years ago
crish	6996dc2273	6204: MesConfig配置添加业务主键	6 years ago
WYnneaoapc	4ceef3c6d1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	6087fe0c2c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	80c340308a	1. 修改通用接口POJO中的字段长度	6 years ago
WYnneaoapc	35f625ac21	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	563955570d	数据同步优化 1078	6 years ago
许心洁	9c54b2561c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	e0ec7bb377	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	50bf9300ba	LAC 调度模式完成	6 years ago
王杰	a95b6baae1	Merge branch 'dev' into test	6 years ago
jokelone	828cf66784	【需求：1090 工序BOM，物料绑定记录删除多余字段】	6 years ago
王杰	cb319e4304	【需求：1126，设备周期计划】	6 years ago
王杰	dfec2532cb	Merge branch 'dev' into test	6 years ago
lpx	00954f2917	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lpx	69be002972	【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】	6 years ago
jokelone	4dcbcf068a	【需求：1090 产品类型图片增加字段】	6 years ago
王杰	7291a7a85c	Merge branch 'dev' into test	6 years ago
汪云昊	86a18d730a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	4b66ec0e87	任务实例id	6 years ago
汪云昊	9907813aed	Lac调度实体	6 years ago
许心洁	c9f26c22c1	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	7ee96d1444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	6fd7e6be5f	【需求：1092 维修类型】	6 years ago
许心洁	bbec6a1002	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	7799937093	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
许心洁	b112bdb5e8	成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除	6 years ago
王杰	75ce77f6f1	【需求：1126，设备周期计划】	6 years ago
钮海涛	6a1990a215	1：新增弹出框选择多个对象信息接口	6 years ago
钮海涛	2e02d77966	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	347c47c82f	【需求：1125，设备报表】	6 years ago
王杰	1846c6f4f8	Merge branch 'dev' into test	6 years ago
jokelone	438517be44	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/MesEnumUtil.java	6 years ago
jokelone	6c847cf305	【需求：1091 返厂返修添加字段和枚举】	6 years ago
王杰	2069d6a3ae	【需求：1125，设备报表】	6 years ago
王杰	9446a76159	Merge branch 'dev' into test	6 years ago
wei.peng	f67a61ec92	网关 添加 APS 路由 ... BASE URL 路径优化	6 years ago
wei.peng	aeff042046	添加 组织代码查询	6 years ago
曾贞一	ed9e388c8b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	1357dfad30	【VDA收货-- 前端PC端POsn页】任务号1102 ... 【VDA收货-- 问题清单中加密库位】任务号1104 【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112 【VDA收货-- 对于分组数据如何查看分组信息】任务号1111	6 years ago
WYnneaoapc	b668879f9d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	42ec1b3693	Merge branch 'dev' into test	6 years ago
王杰	2f382d37cc	【需求：1124，首检件配置】	6 years ago
jokelone	0011a4bc56	【需求：1089 过程检测数据 增加字段】	6 years ago
王杰	dcaf007f4d	【需求：1107，生产工单首检件】	6 years ago
WYnneaoapc	29ac92566d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	b05711dc6c	1：新增弹出框选择多个对象信息接口	6 years ago
许心洁	6d59aeddad	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jiajack	3c8b920a4c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	95789b1bd8	增加生产质量情况BI业务	6 years ago
钮海涛	794bbc4fba	1：新增弹出框选择多个对象信息接口	6 years ago
王杰	35cf3cf162	Merge branch 'dev' into test	6 years ago
jokelone	bc13a8a3ac	【需求：1090 返厂返修增加分页查询】	6 years ago
钮海涛	5b712ce774	1：新增弹出框选择多个对象信息接口	6 years ago
许心洁	c79786a677	合并开发分支的代码POM文件被改成DEV修改回TEST	6 years ago
许心洁	dd86ce354a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	b8842edbb1	无条码打印：新功能开发完成	6 years ago
WYnneaoapc	dbd4a7578b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	88af19f8e9	修改开发环境pom文件test为dev	6 years ago
changjiang.gao	376ca4bbd4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	3f6f6428f6	【需求:1106,设备通知，优化】	6 years ago
changjiang.gao	13066bd4d1	【库存预警】bug 243	6 years ago
WYnneaoapc	04c99167c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	6de6d36e80	数据库抽取反写 1105-1	6 years ago
jokelone	a5609d97fb	【1092 返厂返修增加枚举】	6 years ago
钮海涛	d99ad6c44a	1：新增弹出框选择对象信息接口。	6 years ago
王杰	03a4c98234	Merge branch 'dev' into test	6 years ago
王杰	803d5c57f2	【需求1101，设备维修作业，第3次提交】	6 years ago
wei.peng	699276777a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	7496eb4a1b	LAC 全部 CRUD 接口完成	6 years ago
钮海涛	5183163abd	1：新增弹出框选择对象信息接口。	6 years ago
WYnneaoapc	e6e2e9fb22	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	18161e8191	Merge branch 'test'	6 years ago
crish	67461457fc	Merge branch 'dev' into test	6 years ago
crish	1e0f0c706c	安灯问题修复	6 years ago
crish	f093a97cf0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	4eaa8b5b17	导入导出	6 years ago
crish	6902c79472	问题清单问题修复	6 years ago
crish	7d8b8664cc	问题清单问题修复	6 years ago
WYnneaoapc	848f6b2f23	工位监控优化 1050-6	6 years ago
WYnneaoapc	c71d667d0f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	56996126be	【需求：1101，mes同步设备安灯维修任务】	6 years ago
jokelone	d7f55250ef	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	8d10a46953	(1092 MesProdBindRecordModel增加有参构造方法)	6 years ago
changjiang.gao	30007cee47	Merge branch 'dev' into test	6 years ago
王杰	9bdae2ad13	【需求：1086，设备点检保养作业】	6 years ago
WYnneaoapc	c56822dc40	工位监控优化 1050-5	6 years ago
WYnneaoapc	3dbbee3c60	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	f6b06e6b52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jiajack	aef7f7a948	增加班次顺序字段	6 years ago
jiajack	d87d81e34a	【产线运行情况】-BI报表开发	6 years ago
许心洁	73aef5326c	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	d0b98f0869	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	00e849a62e	(1089 过程质量检测基础数据；1090 返厂返修基础数据)	6 years ago
许心洁	3bc277178e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	f7fbd1c24f	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	3e9cc95017	pojo-model加入andon-pojo依赖	6 years ago
陈思洁	42189da443	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	a90aa8498f	实体修改字段类型【int】改成【Integer】	6 years ago
crish	e15e402890	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	2906667856	mes定时获取安灯安灯任务信息	6 years ago
许心洁	0c20a2b655	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	16162542ba	1：修改listByPage由GET方法为POST方法。	6 years ago
lpx	ca0cf21a7c	【NC解冻-4.2 组件复用】PR12-01~PR12-02	6 years ago
wei.peng	4c6f0b0d57	添加 CRUD Base	6 years ago
陈思洁	935845704a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	e5b5891d23	bom信息中新增冗余字符	6 years ago
crish	a537daee62	导出不导出有效性	6 years ago
qianhs	caf6dc17ab	【NC冻结】nc冻结	6 years ago
crish	fd5c6b2c9d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	0824a58ead	安灯定时自处理job, 广播播报内容优化	6 years ago
WYnneaoapc	34a9ad36fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	1d0a2351b9	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	1f9fc9f280	1：新增实现生产时间的计算逻辑	6 years ago
许心洁	44fccb14d6	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	0c01648551	【需求：1088，设备维修作业】	6 years ago
WYnneaoapc	b47f97fa05	1050-2 工位监控	6 years ago
王杰	09cff08e1e	[需求1086，设备点检保养作业，第2次提交]	6 years ago
王杰	752476b3df	[需求1086，设备点检保养作业，第2次提交]	6 years ago
许心洁	f5a8e9f130	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	d5a45176d0	LAC 任务类型、指令集类型 对象优化	6 years ago
曾贞一	610a96d2ee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6b9c7b3ced	【VDA库存调整盘点】 添加供应商字段	6 years ago
许心洁	77fefbcf74	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e12ba1d839	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	d5864ba490	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	6816c7b566	1：新增实现生产时间的计算逻辑	6 years ago
wei.peng	5e78c31a70	LAC 名称修改	6 years ago
wei.peng	e8f8c941c9	LAC 指令集类型CRUD接口完成 ... LAC 任务类型CRUD接口完成	6 years ago
许心洁	04df70114d	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	e593cc875d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
changjiang.gao	2ba7596a57	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	25f11781c1	盘点差异增加字段	6 years ago
许心洁	ba7fe81978	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	5956d5a08e	冲销：需求变更优化	6 years ago
王杰	07749b50ec	[需求：1086， mes设备点检保养作业]	6 years ago
曾贞一	26b4a5c52c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	a9045ed403	bug 5953	6 years ago
陈思洁	aaa0636920	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	a54d711d95	#1085 BOM导入接口新增	6 years ago
crish	15e812c7a6	Merge branch 'test'	6 years ago
crish	7d20321be5	Merge branch 'dev' into test	6 years ago
crish	10bc56cf46	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	901e37d6e7	修复bug	6 years ago
许心洁	02055a8b7e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	f9b09ce2c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陆卫豪	9558225174	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	87ffdfd9a3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	18789939b0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	ac7b0415ba	1083 添加枚举字段	6 years ago
汪云昊	5c67a7bb5f	MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL	6 years ago
王杰	081d792b98	mes设备通知	6 years ago
crish	fa4f58ec6c	pom冲突	6 years ago
crish	0526da8ee3	Merge branch 'test'	6 years ago
crish	cd74f5336f	Merge branch 'dev' into test	6 years ago
于学杰	9bce0549a7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	dbc69e957a	1. 供应商物料实体增加字段	6 years ago
crish	35241794c9	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	bdb818930b	安灯广播，自处理	6 years ago
wei.peng	689f6057c1	添加查询账号接口	6 years ago
王杰	fa25769c50	mes枚举	6 years ago
刘辉	e89df89f9a	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	0d0178545c	mes设备	6 years ago
WYnneaoapc	44f2b1e826	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
WYnneaoapc	e8336c85d7	idea 异常 文件格式化	6 years ago
changjiang.gao	f2453163b6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	3ab8cf112d	盘点条码差异	6 years ago
WYnneaoapc	1eca1a963a	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java	6 years ago
WYnneaoapc	2da78c3237	idea 异常 文件格式化 + 包装扫描工步	6 years ago
jokelone	7139d9b5f1	解决冲突	6 years ago
jokelone	9e4930968f	解决冲突	6 years ago
jokelone	8a517bc0b9	返厂返修增加字段	6 years ago
刘辉	febbea09c3	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
changjiang.gao	8808a77de6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	69e8357c69	条码数量编辑	6 years ago
于学杰	63e225026c	1. 扩展通用接口功能，支持与软适配的对接	6 years ago
crish	b8225e8bcd	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	0fdabe4950	知识库 ，自处理开发	6 years ago
刘辉	4ffc63ce83	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	f6be80db01	增加groupby 构造函数	6 years ago
许心洁	a1597c089c	成品冲销+导入转换格式（就一个不知道是什么单导入）	6 years ago
钮海涛	5a682467d1	1：在字段信息表中新增枚举项数组，前端在选择枚举内容时不需要再从后端获取。	6 years ago
王杰	b0f85a2bdc	Merge branch 'dev' into test	6 years ago
王杰	1d3fc8b5c9	mes作业任务	6 years ago
许心洁	9fa2f376e4	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	2dc63a9a4e	1：修改部分字段默认在界面不显示 ... 2：为字段新增默认值。	6 years ago
crish	1de89d732b	本地误拉了test代码，解决pom	6 years ago
crish	9f9874902d	冲突解决	6 years ago
crish	9edfa3d481	安灯知识库	6 years ago
曾贞一	e603ac66a7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	4809b8bc83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	16839f6911	成品冲销+抛异常方法封装优化	6 years ago
王杰	5a036f14cb	mes设备作业任务	6 years ago
jokelone	7fc439319e	返厂返修	6 years ago
陆卫豪	413266293e	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	030391a93c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	56d7457826	工位监控提交	6 years ago
曾贞一	5e7fb00d0c	【生产领料】	6 years ago
许心洁	1f1b4f7511	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	48a6cdc39c	作业任务：作业类型 枚举增加	6 years ago
crish	e260045c42	Merge remote-tracking branch 'origin/test' into test	6 years ago
crish	97763d6b53	安灯广播， 安灯管理显示不同界面， 添加操作来源字段	6 years ago
王杰	b561110e54	Merge branch 'dev' into test	6 years ago
王杰	9cc89f9397	mes设备周期计划	6 years ago
许心洁	2f843a8f5a	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	88754f9a71	收货看板重写	6 years ago
许心洁	986157043d	流程设计：新增组件参数类型：可配字符串	6 years ago
于学杰	68a6c85068	Merge branch 'dev' into test	6 years ago
陈思洁	cd8bd3a68b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	3828b4863c	添加保质期字段	6 years ago
曾贞一	dfdb6be4bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	6a9924eda6	【VDA生产领料】 FIFO推荐组件	6 years ago
crish	ce187f9720	安灯广播	6 years ago
钮海涛	8a316ff2d5	add mrp function to aps	6 years ago
王杰	ef3be61f66	Merge branch 'dev' into test	6 years ago
王杰	14123c008e	mes设备周期计划	6 years ago
jokelone	ffdb547dc7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	203b53d3b3	解决冲突	6 years ago
jokelone	da97adcbc7	更改db地址清单名称	6 years ago
wei.peng	e7e4a8587f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
于学杰	75bb3f4780	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	fcefe8de38	1. 通用接口增加调用软适配的功能（使用脚本引擎实现）	6 years ago
王杰	611b25abfd	Merge branch 'dev' into test	6 years ago
王杰	9a6b1c4bf1	mes设备作业周期计划	6 years ago
jokelone	2238bee7d4	增加查询结果设备名称	6 years ago
汪云昊	d91fa61c88	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	6c1891c193	软适配报文状态及微服务接口调整	6 years ago
wei.peng	05fd0fe686	WebService Server 优化完成	6 years ago
许心洁	7863325afd	本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原	6 years ago
许心洁	b7b78b85ac	误拉了test分支的代码：还原	6 years ago
许心洁	d351c36ffc	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	c681340355	工位监控添加枚举一字段	6 years ago
汪云昊	52a5fe74af	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	508bc3589b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	74fb558135	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	95a354f537	解决无法处理bug	6 years ago
wei.peng	029f14d36f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java	6 years ago
刘辉	83a7a9e988	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	d9dd10761e	WebService 欧洲对接完成	6 years ago
changjiang.gao	9e1b86eb2b	导出显示bug修改	6 years ago
王杰	2ed8ebdbd7	Merge branch 'dev' into test	6 years ago
changjiang.gao	0e7c7fbfb2	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	45b4264c67	导出显示bug修改	6 years ago
jokelone	1758a4e50e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	a79769d229	mes-pcn枚举	6 years ago
王杰	37f7e92d53	mes实体类	6 years ago
许心洁	8deff73454	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
jokelone	f15574fc9f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	5d730ed5c8	解决冲突	6 years ago
wei.peng	f35461ef57	WebService Server 优化完成	6 years ago
jokelone	72bdd253fa	解决冲突	6 years ago
changjiang.gao	ef08c52411	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
changjiang.gao	647508d92c	导出显示bug修改	6 years ago
wei.peng	508d4b5aba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java	6 years ago
汪云昊	d83de01d33	服务端适配日志bug解决	6 years ago
刘辉	722146acd8	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	624751a697	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	9ac327e622	细节调整	6 years ago
bleakney.liu	417b4a09db	代码格式优化增加枚举	6 years ago
bleakney.liu	29fee6b028	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	746a04f96d	代码格式优化	6 years ago
许心洁	d406532b37	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	1e5e35ee6f	Pojo 合并代码	6 years ago
wei.peng	babaf2f7d6	WebService 客户端Xml参数调试成功	6 years ago
汪云昊	fe1e83609e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	f3867c64f4	软适配微服务接口	6 years ago
wei.peng	61a38c9acd	WebService Server 优化完成	6 years ago
许心洁	6fc4474699	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	456657489f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	a4d873f36f	添加过滤条件	6 years ago
许心洁	a961da57ef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
bleakney.liu	afe19bf6eb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	778c1a79a7	【静态盘点】增加库存调整盘点	6 years ago
jokelone	9e2b13e3ad	解决冲突	6 years ago
crish	dc3fd624f2	Merge branch 'dev' into test	6 years ago
jokelone	219b2d2ad3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jokelone	104d308d30	PLC DB 设备故障 过程质量检测	6 years ago
crish	8148fc86e6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	c39462cd35	安灯广播	6 years ago
许心洁	b22c6fbcaf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
王杰	d814887570	mes设备	6 years ago
许心洁	b43f4aef72	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	73b8fd1de4	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lbwgithub	09ea0929e4	枚举	6 years ago
陆卫豪	a791430fec	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	df6f432534	1012 修改绑定关键件 和 工序bom添加isBindKey	6 years ago
许心洁	f778b15ea5	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	40321ed7ec	Merge branch 'test'	6 years ago
crish	4e2373bdae	Merge branch 'dev' into test	6 years ago
WYnneaoapc	20843e06a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	4654fad2bd	1011 生成条码工步	6 years ago
crish	e79ff6946a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	db26628d9f	安灯广播	6 years ago
王杰	096c02d42d	修改	6 years ago
王杰	24a3b0e2b0	mes字段	6 years ago
陈思洁	91fada5cc0	枚举修改	6 years ago
crish	672438f2c0	Merge branch 'test'	6 years ago
crish	b6179f9f71	Merge branch 'dev' into test	6 years ago
crish	be63f4eab9	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	37e2a88ca7	物理安灯和软件安灯插入安灯附属表的逻辑	6 years ago
王杰	5debda474d	Merge branch 'dev' into test	6 years ago
王杰	2a1274df65	mes组织模型	6 years ago
许心洁	04cdf58aef	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	abd2321850	格式化代码	6 years ago
lbwgithub	658b25bd65	格式化代码	6 years ago
lbwgithub	11676cb942	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	3ebf17adb1	格式化代码	6 years ago
lbwgithub	926c9c3d60	方法移值	6 years ago
crish	0924810e64	Merge branch 'test'	6 years ago
王杰	921859f4de	Merge branch 'dev' into test	6 years ago
王杰	6c54f204b7	mes设备	6 years ago
王杰	982f8ad741	mes设置组织模型	6 years ago
lbwgithub	d11058019b	枚举	6 years ago
lbwgithub	cf3ee95623	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	6596931124	枚举	6 years ago
许心洁	56f7048098	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	4b032ac426	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	16073eb7e5	安灯附属表插入时， 完整数据； 添加安灯来源接口	6 years ago
许心洁	89ab1816e3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
lbwgithub	8d7c77d3ed	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	71a68e8cf6	枚举	6 years ago
许心洁	c955047746	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	1769e7765f	加了main方法发版报错	6 years ago
王杰	95cc0b433e	mes组织模型bug修复	6 years ago
王杰	18bc35f60d	Merge branch 'dev' into test	6 years ago
lbwgithub	c67fe92297	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	3e8bcbeb84	枚举	6 years ago
钮海涛	5c68a15d0c	add mrp function to aps	6 years ago
WYnneaoapc	60f441e685	Merge branch 'dev' into test	6 years ago
WYnneaoapc	76149da904	提交	6 years ago
WYnneaoapc	a1525eae8b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	d495046dcf	添加XML 工具实现	6 years ago
WYnneaoapc	18ec7d091a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c9a572469c	同步限制解除	6 years ago
lbwgithub	473e2caea0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	2cf4759c21	枚举	6 years ago
刘辉	60d1798b9c	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
王杰	ddfb47e6ac	mes设备台账功能开发	6 years ago
陈思洁	0bdc3592e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f67e7df17f	新增冗余字段	6 years ago
曾贞一	28af3c27e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	320c7f6b1f	【生产快速入库】生产快速入库导入接口	6 years ago
汪云昊	de685a0627	删除pojo数据默认值	6 years ago
许心洁	1e41ab2e39	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
汪云昊	9553e962e3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	bd55a18bf6	微服务接口 - 打印模板分页查询	6 years ago
曾贞一	9d3b45d2e2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ddd91f51b5	【生产快速入库】组件选择，任务编号1051	6 years ago
许心洁	232c675444	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	d2c3045575	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	84a96a22fa	新加NotNumBiggerPackContainsZero方法	6 years ago
lbwgithub	4477820c1b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	68b0058e1b	枚举	6 years ago
许心洁	1b5df102e7	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	ccd04804c0	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	95f156adf4	所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double	6 years ago
陆卫豪	6c434e114d	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	8cca6706b2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	4eada1c343	表同步	6 years ago
许心洁	1a7b4e3438	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘辉	1defd0d8be	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	6 years ago
陈思洁	113bb8755d	解决冲突	6 years ago
陈思洁	4ac7bae38b	新增hql	6 years ago
bleakney.liu	0fa1ffa23b	[物流线路修改]修改数据类型	6 years ago
bleakney.liu	f682d056be	[物流线路管理]修改查询条件	6 years ago
许心洁	653c8dca1f	直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误	6 years ago
WYnneaoapc	a11eeae45c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7ee11674ab	读取托盘	6 years ago
crish	7646e1fcfc	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
曾贞一	e24474fc8c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	2b62357ab5	VDA收货【生产快速入库】组件，任务编号1051	6 years ago
wei.peng	cecd37a1e7	添加Xml 工具	6 years ago
许心洁	1d17198daf	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	9b6887dd40	#1050 工位监控	6 years ago
王杰	72c9a5892d	修改注释	6 years ago
汪云昊	ac1c18581e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	d8c740819c	FTP适配器	6 years ago
crish	01ea2f511c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	77a8cdebd5	安灯升级	6 years ago
许心洁	61804a27b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
钮海涛	16bb46df55	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	980cb2a56b	add product order spread to aps	6 years ago
lbwgithub	ddf1d2e6dc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	5a5b7b882e	条码模型	6 years ago
bleakney.liu	82ab39d559	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	4ceba7144c	【物流线路修改】 修改枚举值重复问题	6 years ago
许心洁	10fcc569bd	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
许心洁	dbb1341d6f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	e90c59ccf2	生产报工当查询到多条子物料时查询的SQL没有返回itemQty	6 years ago
bleakney.liu	8beee972a9	【物流线路维护】 增加处理模式类型	6 years ago
bleakney.liu	e9f82d9259	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	692110b92b	【物流线路维护】增加前端处理模式枚举	6 years ago
许心洁	e35cf183da	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	42a8fb357f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	82fe491bd3	#1050 工位监控	6 years ago
钮海涛	f55e65a227	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
钮海涛	10ce1e165e	add order spread to aps	6 years ago
lbwgithub	0dd15baa2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	4fc72ca358	条码模型	6 years ago
crish	ff272afe2c	添加工厂条件	6 years ago
crish	e0c7822803	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	864168def0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
lbwgithub	81d86d1bd2	条码模型	6 years ago
许心洁	7a403a37da	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	6 years ago
bleakney.liu	4409f34e0f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	aea18f89c6	安灯放行说明字段维护openInfo， 安灯响应通知标识字段signSendFlag维护	6 years ago
汪云昊	3ef7d24eab	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
陈思洁	3cc1997ae2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	c2da7410eb	新增枚举提交	6 years ago
crish	d1d813614a	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	e20ee7b1ff	安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤	6 years ago
lbwgithub	ab6d6e695b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	9a21e2d99f	条码差异详情返回值	6 years ago
crish	fe174a47ee	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	fb9340fc09	安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑	6 years ago
jenkins	30eee05b1c	Merge branch 'dev' into test	6 years ago
WYnneaoapc	766d195088	开线合并代码	6 years ago
WYnneaoapc	183fd78eac	冲突解决	6 years ago
jenkins	99382a8fca	Merge branch 'dev' into test	6 years ago
曾贞一	3fb2e44eaa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	c509f3c707	VDA 生产快速入库	6 years ago
wei.peng	eb70017396	Xml 解析添加重试机制	6 years ago
曾贞一	bc83b57f8e	合并代码	6 years ago
曾贞一	fb86682652	VDA 生产快速入库	6 years ago
jenkins	0982f01eb2	Merge branch 'dev' into test	6 years ago
陈思洁	26684524f1	生产报工组件和生产报工标签组件提交	6 years ago
jenkins	7e3edd06a0	Merge branch 'dev' into test	6 years ago
陈思洁	3ba6508b0c	新增打印机配置表	6 years ago
陈思洁	22fbbe2a91	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	edfc78995b	新增打印机配置表	6 years ago
汪云昊	3b46d242a7	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/BlockSoftSwitchEnumUtil.java	6 years ago
汪云昊	d830c78d03	FTP适配器	6 years ago
wei.peng	4e303413ff	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	c0fc2c36bf	Socket 适配器完成 ... MQ 适配器完成	6 years ago
刘敏	8a94b054d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	c2a75d96da	实体字段get方法修改	6 years ago
jenkins	607d8202ae	Merge branch 'dev' into test	6 years ago
许心洁	bc5dfb2f4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	f1f712c997	流程管家关联查询流程明细BUG：导致流程错乱	6 years ago
王杰	80f50fe800	Merge branch 'dev' into test	6 years ago
王杰	804574090f	pcn生产工单	6 years ago
crish	a601d5ddf3	orderBy方法去掉为空判断	6 years ago
crish	9ae6ee5016	Merge branch 'test'	6 years ago
crish	51c21f2c22	Merge branch 'dev' into test	6 years ago
crish	d8824ab066	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	4173f0637f	安灯正式环境发布	6 years ago
曾贞一	8a89b95ebf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	cd8a5df991	VDA 生产快速入库组件开发	6 years ago
钮海涛	1d281da531	add order spread to aps	6 years ago
jenkins	d5349806c9	Merge branch 'dev' into test	6 years ago
许心洁	dcf326366e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	8f7d3b371b	流程管家：回显给前端当前步骤参数类型	6 years ago
jenkins	829171f8a4	Merge branch 'dev' into test	6 years ago
刘敏	ef6c47dc35	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	e42cd80b8b	条码打印枚举添加待退料状态	6 years ago
jenkins	9e12bb5da3	Merge branch 'dev' into test	6 years ago
crish	7ea051b42e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
许心洁	49bdbacc2f	盘点差异回显样式需求（存储区：红色；库位，数量：黄色）	6 years ago
crish	87dfdc6471	增加方法notInPackArray（）， 修复工具类 notInPack() notInPackString()方法无效的问题	6 years ago
jenkins	479caf432d	Merge branch 'dev' into test	6 years ago
钮海涛	be30cecf13	add integration to aps	6 years ago
jenkins	f07764acda	Merge branch 'dev' into test	6 years ago
王杰	80bad03881	mes-pcn生产工单	6 years ago
jenkins	38f2716a76	Merge branch 'dev' into test	6 years ago
刘敏	bc1dea29ad	po、asn查询条件添加	6 years ago
WYnneaoapc	f96cbd1be3	Merge branch 'dev' into test	6 years ago
WYnneaoapc	033b23321f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	7c472b386a	提交	6 years ago
lbwgithub	3ba7719160	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
lbwgithub	31b32be60d	颜色状态	6 years ago
jenkins	6250794847	Merge branch 'dev' into test	6 years ago
许心洁	3fc42f03b5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	750a216fd2	任务列表显示：添加创建时间和源存储区字段（盘点）	6 years ago
王杰	704d4f2098	mes生产工单	6 years ago
wei.peng	355cd49649	注释 WebService 发送邮件客户端	6 years ago
王杰	f24744a1f6	Merge branch 'dev' into test	6 years ago
王杰	e5a20d4733	生产工单	6 years ago
jenkins	e56a5b037c	Merge branch 'dev' into test	6 years ago
钮海涛	47054bf0c6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	4a78dfa493	add integration to aps	6 years ago
jenkins	790c0b4ec6	Merge branch 'dev' into test	6 years ago
汪云昊	7131271edc	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	3e06a11cb3	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	f8b385d274	add integration to aps	6 years ago
jenkins	7ce12a9c85	Merge branch 'dev' into test	6 years ago
刘敏	522efe67b6	excel导出优化--单据状态显示枚举描述	6 years ago
jenkins	cbc5882bd5	Merge branch 'dev' into test	6 years ago
王杰	b1f5f4f073	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	d676bcf974	mes生产工单下达配置状态	6 years ago
钮海涛	34beff6cc7	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	153238d31a	add integration to aps	6 years ago
刘敏	0f82f3fbe5	导出状态添加	6 years ago
jenkins	c29c350ef8	Merge branch 'dev' into test	6 years ago
许心洁	e5591eafc5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	c10bf2e3e1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	33233ba80c	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	6b182cf4b5	add fix controller bugs	6 years ago
crish	4b17c6ca69	Merge branch 'dev' into test	6 years ago
王杰	310d0f0606	mes生产工单审批	6 years ago
刘敏	e02f2bfeee	单据条码实体临时字段增加	6 years ago
许心洁	ec3ef597e8	根据工厂代码调整库存	6 years ago
曾贞一	d07173bd64	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
crish	dcc13e622b	Merge branch 'dev' into test	6 years ago
WYnneaoapc	5cb2e7994b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	cf64f0118a	提交	6 years ago
crish	f3f77e63b3	Merge branch 'test'	6 years ago
crish	4d5497929a	Merge branch 'dev' into test	6 years ago
刘敏	a9e369e716	任务枚举添加导出转换方法	6 years ago
刘敏	ed29263655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	adf699f618	移动单表是否快照临时字段新增	6 years ago
crish	9f0f6da4c7	安灯原因统计报表增加发生频次统计	6 years ago
汪云昊	0b8bc114bc	服务端调整	6 years ago
crish	1ca98cebf3	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	2d911c4257	安灯优化	6 years ago
bleakney.liu	53dd9cface	add 物流路线pojo	6 years ago
WYnneaoapc	27a7aa960c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	37701bed62	提交	6 years ago
王杰	9b82b0be2a	mes班组维护	6 years ago
刘敏	f6e9dd03b4	库存快照job开发【任务1011】	6 years ago
刘敏	4e46760fb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	f57dd8e999	库存信息表、库存条码、移动单三张表快照时间新增	6 years ago
crish	c47c617aab	Merge branch 'dev' into test	6 years ago
王杰	8570b88761	mes生产工单	6 years ago
crish	c17039ce4a	Merge branch 'dev' into test	6 years ago
WYnneaoapc	4e1635fe7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	9b0c5de954	提交	6 years ago
曾贞一	6c8cfd8678	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
曾贞一	a4262c5e1e	pom文件修改 dev改成test	6 years ago
crish	b473fd1b46	pojo开发环境 pom文件修改为dev	6 years ago
crish	87f8dc38a6	测试环境	6 years ago
crish	96fd66456e	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	d82e025eb9	dev环境pom文件修改为dev	6 years ago
于学杰	c974cf1450	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	d273159e3e	1. 增加目的质量状态（规则表）	6 years ago
crish	81128be4e7	安灯事件原因报表增加日发生频次， 周发生频次 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
钮海涛	68da44de9e	add expression to aps	6 years ago
钮海涛	d187f8b3e1	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	52a770ad45	Merge branch 'dev' into test	6 years ago
王杰	24a31c0bdf	生产工单实体	6 years ago
crish	03a5481210	Merge branch 'dev' into test	6 years ago
王杰	9ed873422e	mes生产计划	6 years ago
钮海涛	d3194ac4bc	add expression to aps	6 years ago
jenkins	541ea98d98	Merge branch 'dev' into test	6 years ago
crish	a9a318e354	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	8f58627838	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
wei.peng	1e01f62188	Bug 修复	6 years ago
wei.peng	61b0dfdc3b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	cb5eb56fe4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	5d1e6e8474	VDA收货 库位推荐入库规则	6 years ago
刘敏	baf39dc0ce	生产退料导入实体新增	6 years ago
刘敏	809478be44	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d8bc8d713d	条码打印model字段添加	6 years ago
wei.peng	41588f37d7	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	d1d7e65f97	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	c6badc59c6	适配记录添加id参数	6 years ago
wei.peng	c7ed8613d6	软适配添加WebService 默认处理	6 years ago
汪云昊	83f400a36b	sql 注入 删除斜杠	6 years ago
crish	b31162c5d6	安灯工位放行， 安灯任务管理界面数据权限控制 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
bleakney.liu	2c146d39bf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
bleakney.liu	e52c310d38	add 入库pojo 和response	6 years ago
jimmy.zeng	4bfa05698f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	9e2169fa87	推荐入库 组件开发	6 years ago
曾贞一	15d399e4c7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	512ebb495c	VDA收货 提交组件	6 years ago
wei.peng	6cbcea7c2c	系统菜单默认排序值改动	6 years ago
于学杰	f6bb2ee21f	Merge branch 'dev' into test	6 years ago
曾贞一	337e5f7084	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	f17c1d3d25	推荐入库 组件开发	6 years ago
王杰	2460fbc3b4	生产计划	6 years ago
汪云昊	baa23aab03	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
crish	23c59d4326	Merge branch 'dev' into test	6 years ago
汪云昊	564deb4d6b	适配记录及数据库适配器	6 years ago
WYnneaoapc	271a26d2b8	提交	6 years ago
jenkins	26179650f0	Merge branch 'dev' into test	6 years ago
许心洁	787f12387d	流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理	6 years ago
jenkins	9033584a52	Merge branch 'dev' into test	6 years ago
钮海涛	70868503d4	add beans services controllers to aps	6 years ago
jenkins	bca4f7745f	Merge branch 'dev' into test	6 years ago
许心洁	90b731fde4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	de6792426e	流程管家：单据完成提交所有待提交移动单；只推送当前移动单 ... PDA收货组件：改数后删除历史记录BUG修复	6 years ago
wei.peng	33473f9903	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
WYnneaoapc	f51ba09666	提交	6 years ago
钮海涛	30ecc48007	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	3c907fe88a	add material bean to aps	6 years ago
crish	989cbbdee8	安灯目录结构调整 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
wei.peng	4ca0851386	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d509e5755a	vda 收货超收处理	6 years ago
jenkins	603647bc82	Merge branch 'dev' into test	6 years ago
曾贞一	c5f43236a3	开口合同与po关系	6 years ago
汪云昊	3474bb82c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	f978ee39c8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
汪云昊	6093ec0621	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	f6c1eff0f1	excel通用导入优化	6 years ago
于学杰	54db1929b1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	05dc432c57	1. 增加关联单位和关联数量字段	6 years ago
汪云昊	d120b1615a	国际化工具类	6 years ago
jenkins	ee979c6e02	Merge branch 'dev' into test	6 years ago
汪云昊	9caf9a4458	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	2f904f9eee	数据库适配器	6 years ago
汪云昊	c27449a185	异常信息国际化	6 years ago
王杰	f5164d82fb	通用查询方法	6 years ago
jimmy.zeng	bd466610d5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	72fec8146d	修改	6 years ago
jimmy.zeng	b5eb716a4e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
钮海涛	46bde2804d	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
钮海涛	6008478aec	add customer field function	6 years ago
jimmy.zeng	d23045a667	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5b6477bba6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	510485d2f0	excel导出优化--单据状态显示枚举描述	6 years ago
wei.peng	a86f2e49c5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	51974a46b9	WebService 调用发送邮件测试	6 years ago
许心洁	59569cef66	移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+ ... 交易处理组件（出入移库）：待入库的可能是不合格的+ 公共PDA组件抛异常获取值为空	6 years ago
crish	35beb0c60e	Merge branch 'dev' into test	6 years ago
汪云昊	40a2a789be	参数描述调整	6 years ago
wei.peng	377a875fec	软适配客户端代码结构调整。	6 years ago
wei.peng	1661e4e0a9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... Conflicts: modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java	6 years ago
wei.peng	fc1c7ab797	软适配添加-所有适配命令 接口	6 years ago
汪云昊	ca7d5a2896	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	8b0e851eb8	数据源适配套件相关接口	6 years ago
wei.peng	2c6b223628	软适配客户端代码结构调整。	6 years ago
陈思洁	02270ea6e8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f5d2398e0e	VDA收货--开口合同增加字段 ... 供应商增加字段	6 years ago
于学杰	01c58e8653	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	3454712bd2	1. 增加库存快照的类文件	6 years ago
汪云昊	873f91a2eb	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	f718a5dac5	excel通用导入优化	6 years ago
刘敏	f777c82ea7	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	5b7ac2c344	ASN字段修改	6 years ago
wei.peng	212cfb02af	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	71798e9f51	软适配功能配置优化	6 years ago
汪云昊	21240ffa53	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	eeff3517c6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... # Conflicts: # modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java	6 years ago
许心洁	e8b9f58f43	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	262f7efe05	如果有异常信息需要叠加在提示信息前一起返回给前端	6 years ago
汪云昊	07688db533	软适配实体	6 years ago
陈思洁	74bdaccfbd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	8ed0d4d60e	枚举维护业务类型数据	6 years ago
汪云昊	f2e2dd1670	软件适配器 数据源适配器 ... 单号生成高并发优化	6 years ago
wei.peng	21241e45ca	软适配功能配置优化	6 years ago
王杰	58d6305bd3	mes动作	6 years ago
刘敏	c7734b7e26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5144d15ac4	采购单报表开发	6 years ago
crish	bbfc9b320f	Merge branch 'test'	6 years ago
crish	4a1ad40dfa	Merge branch 'dev' into test	6 years ago
crish	726600fccd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	f205373964	安灯事件报表安灯类型导出 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	03ef38f853	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	315787197a	交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性	6 years ago
曾贞一	b5dfa7dbd2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	8d6e4fdfa5	盘点实盘导入功能	6 years ago
陈思洁	677632748d	VDA收货逻辑组件修改--修改sql中增加库存地字段显示	6 years ago
刘敏	4c39e84094	asn主表添加	6 years ago
wei.peng	ca28ae6cad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	0ac5232eb0	自定义表单 默认值取值方式修改	6 years ago
wei.peng	b899c5c8c5	软适配 WebService 功能接口开发	6 years ago
王杰	c950019077	pcn定时任务	6 years ago
陈思洁	3b174fc782	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	f63cd5071b	新增开口合同实体	6 years ago
许心洁	8fc5788f64	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	e921bb72d2	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/BlockSoftSwitchEnumUtil.java	6 years ago
wei.peng	9ec5e63da6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
wei.peng	5b200f824f	软适配 WebService 功能开发	6 years ago
汪云昊	3eef8ea750	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	029d7eac62	软适配model	6 years ago
许心洁	a959964950	移动单三张表加上乐观锁	6 years ago
crish	39e0fbca80	Merge branch 'dev' into test	6 years ago
crish	3266c9b1e0	安灯状态导出 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
wei.peng	e58aaf95b9	软适配 WebService 功能开发	6 years ago
jimmy.zeng	2d376575a3	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	3c6d17a283	修改pojo数据类型	6 years ago
jimmy.zeng	ccffe9b7bd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	229587fcf3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ceced4c4b6	欧洲项目 检查数量 批次格式组件编写	6 years ago
WYnneaoapc	c44a99eb40	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	61a7985afc	提交 0905	6 years ago
刘敏	5b97a9e0cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	241a478f65	excel导出优化--单据状态显示枚举描述	6 years ago
crish	8d8752b8b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	89b0a4a68a	条码打印调试 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
刘敏	f0fba5e23a	盘点枚举添加--excel导出	6 years ago
刘敏	b3b913d768	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	8ac4f214b3	#5596	6 years ago
王杰	fe455a7147	pcn离线登陆	6 years ago
jimmy.zeng	836b0e933e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	09aab6d87a	盘点添加 存储区多个查询	6 years ago
jimmy.zeng	a4725e20c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	a59f95080c	自定义表单-同步对象功能优化 ... 自定义表单-动态页面数据导出	6 years ago
曾贞一	a12a008713	盘点库位添加查询条件	6 years ago
曾贞一	b7bd96fa44	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
WYnneaoapc	546d9dc7a5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	61ed3d821d	提交 0905	6 years ago
曾贞一	d4007f6ca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	64aed1f49c	开发 Restful 接口测试PDA	6 years ago
jimmy.zeng	fd76f08af4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	d2995520d4	mes-pcn定时任务增加字段	6 years ago
曾贞一	8b9a4fb109	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	575aa6ea2f	库存移动单报表 添加修改人，修改时间的查询条件和列表	6 years ago
刘敏	20bd7994a3	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	e4cf678000	构造新增字段	6 years ago
WYnneaoapc	4b982fc4fe	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1332f11a23	提交	6 years ago
jimmy.zeng	8f1ac3fdae	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	f370f377d4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	7ce78b170f	工作参数枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
刘敏	c05b22668f	字段修改	6 years ago
jimmy.zeng	835245f8f4	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	2108a7f8e7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	4852a4754c	字段枚举值添加	6 years ago
crish	65cb39d7ba	工作中心代码修改 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	7da95b1ad2	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	876571e877	任务：994；BUG：5498	6 years ago
jimmy.zeng	0a3339ba8d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	67b1e5d4f6	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	ff462900b7	枚举描述添加	6 years ago
jimmy.zeng	6e48f0a677	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	d8568e6d22	盘点优化代码。	6 years ago
曾贞一	5290ba6f63	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	01cb76da6d	指令移库 根据目标存储区扫描库位	6 years ago
刘敏	836f1bf870	字段修改	6 years ago
陈思洁	2af903f029	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	254f08da32	物料描述修改	6 years ago
jimmy.zeng	2e8a70d8b4	pom版本还原--pojo	6 years ago
刘敏	5fb7ffc40b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	0faeaa6047	导出枚举添加	6 years ago
王杰	482159b322	mes-pcn定时任务枚举修改	6 years ago
刘敏	193eba75d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5b735fe3a2	移动单枚举导出	6 years ago
许心洁	71b6c64ed0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
刘敏	3b86092577	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	5f539afd6d	移动单明细注解添加	6 years ago
许心洁	53a08621fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	db4f6bcdb1	流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）	6 years ago
汪云昊	b760543b3b	excel通用导入优化	6 years ago
crish	a5b01bbaae	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	69d2932ca4	http请求增加不需要设置请求内容枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	fe793f0431	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	3a1cf7a2b7	判断属性是否有final修饰	6 years ago
许心洁	d87cbd9c4f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	b4b095c970	判断属性是否有final修饰	6 years ago
许心洁	5db4307fa5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
汪云昊	4d5c92df78	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	d5cfe77ac5	mes定时任务枚举	6 years ago
汪云昊	32502582c1	新增属性初始化	6 years ago
王杰	46d220f3ec	mes条码规则校验	6 years ago
WYnneaoapc	bb975b208b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	cbcdcabd82	测试修改提交	6 years ago
许心洁	84ace781a3	流程添加默认值方式错误	6 years ago
许心洁	503b68a0a5	拉了测试的代码POM文件错乱	6 years ago
许心洁	6068ca9fd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	7d19c1bbed	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	cafd923d3a	流程管家：添加作业记录明细（作业记录不再更新移动单号：一个步骤记录一个作业记录明细）	6 years ago
许心洁	706ddcbba7	流程新增初始化组件明细组件赋默认值0	6 years ago
许心洁	04f8aaa783	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	eadb86ce60	excel通用导入优化	6 years ago
汪云昊	fb3b8a033d	excel通用导入优化	6 years ago
jimmy.zeng	4f58949e2d	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	5ea81cc34e	实体修改	6 years ago
陈思洁	2a90329fcf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	63be82f044	实体修改	6 years ago
jimmy.zeng	73b6088977	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	6f87b97721	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	d484efb69e	明细构造新增	6 years ago
crish	7c29add7ca	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	c9df6efd1c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	65b336f708	任务993+生产报工产生的移动明细单位错误BUG修复+PDA颜色回显完成的明细颜色没有与处理中的区分开BUG修复	6 years ago
crish	7aec1fdb6a	添加工步类型枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
WYnneaoapc	7f3f39af06	提交	6 years ago
WYnneaoapc	63c0f02f32	提交	6 years ago
WYnneaoapc	146cf768d6	提交	6 years ago
jimmy.zeng	fef022ce13	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	5e06022e51	Merge remote-tracking branch 'remotes/origin/dev'	6 years ago
jimmy.zeng	2a7ba550d6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	24a9d3ff2c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	8a5337daad	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	235a728c0e	andon ... Signed-off-by: crish <570360737@qq.com>	6 years ago
陈思洁	b1dd7d3915	合并冲突	6 years ago
陈思洁	d269576dbf	新增字段	6 years ago
jimmy.zeng	08b697a72e	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	9c26f45cd5	明细状态枚举添加	6 years ago
王杰	2e86ff81d0	mes工作单元参数增加枚举	6 years ago
jimmy.zeng	06927a31bd	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	09eee24769	mes工作单元参数CRUD	6 years ago
王杰	8034e104c8	mes工作单元参数	6 years ago
王杰	5388c4405b	mes-pcn-task表修改	6 years ago
jimmy.zeng	154730e69b	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
crish	6e5176c3fc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	b10262b21f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	ac1090d661	报表返回字段信息添加	6 years ago
crish	9981c4089b	修改唯一性校验， 不能新增禁用的信息 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
王杰	d7ddf4d5a0	mes-pcn定时任务数据同步日志表修改类型	6 years ago
王杰	6929e88570	mes-pcn定时任务	6 years ago
crish	84bcdbaf7d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	f09ac4d897	安灯任务 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
曾贞一	ceac2db551	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	399a51b044	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	27d574314d	getList未查到数据要判断+补全所有showInformation区分颜色	6 years ago
crish	95b48cdc54	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	71e7362216	PCN数据同步， 逻辑修改 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
曾贞一	ae12af551b	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	cfc0de67cf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	057fa88904	revert	6 years ago
刘敏	56a4d6b362	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	19253a9b6a	构造函数新增条码	6 years ago
crish	c6584a9437	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	368a3a1c66	mes枚举 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
许心洁	7740503a97	getByProperty查询到多条数据抛异常	6 years ago
wei.peng	96a29d3de8	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	a2fe1a80f9	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
wei.peng	90bb35c83f	用户默认分页配置功能开发 ... 用户获取首页插件Bug 修复	6 years ago
许心洁	18dac2b569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
jimmy.zeng	1b06c1d07f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	5947f88da1	mes-pcn定时任务工作清单数据同步	6 years ago
汪云昊	b7e17c5451	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	2325d18660	软件适配器 认证参数接口	6 years ago
WYnneaoapc	3bedf8fb8d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java	6 years ago
WYnneaoapc	953f593207	提交	6 years ago
刘敏	0dc452c4c8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	592cd15add	调试枚举删除、库位导入工厂字段添加	6 years ago
crish	5df2db4b46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	f820c449bb	工步条码打印 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
wei.peng	b34be0b86e	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
汪云昊	2ef0dd5c3b	周期修改关联数据	6 years ago
许心洁	9de4d79009	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	d2036fd841	任务961，962，966，973	6 years ago
曾贞一	25e7ca08d3	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	59047b5b4c	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	12f6e2c14b	mes-pcn定时任务表维护	6 years ago
jimmy.zeng	7e5d2e1e56	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	18eff49e63	hql语句拼接修改	6 years ago
陈思洁	08fbbee9c1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	11aff72404	新增冗余字段	6 years ago
wei.peng	cf026d6dee	获取模板详情列表功能接口开发完成	6 years ago
wei.peng	1f1a9c39fc	异常国际化功能开发完成	6 years ago
crish	f7b366fe29	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	6 years ago
crish	c584f2e048	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	12a2a27b18	mes， pcn条码打印 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
曾贞一	5aceaca82d	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	61822039c5	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
许心洁	3f5f89bd1b	流程管家：获取ID真实值代码错误导致新增的组件缓存错误（手工领料历史记录无法查看）	6 years ago
jimmy.zeng	9680112434	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	18aff86ea0	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
王杰	3b3ddd581a	mest条码生成规则最大值是否循环枚举	6 years ago
jimmy.zeng	6d925d6b9f	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
王杰	b375983304	mes条码生成规则CURD及mesbug修复	6 years ago
许心洁	a38347d2fb	revert	6 years ago
许心洁	b20d333ae4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	34e2c13b38	getByProperty获取到多条数据报错	6 years ago
wei.peng	856c77a965	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
jimmy.zeng	c901f18f89	pom版本还原	6 years ago
wei.peng	0bc9f2e9bc	获取模板 微服务调用重新编写	6 years ago
jimmy.zeng	188e2b5efd	pom版本还原	6 years ago
WYnneaoapc	c7842e63a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	2deb384cca	提交	6 years ago
crish	3093aa1e86	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	bfd682cb27	安灯按照产线过滤信息 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
于学杰	921859b996	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
于学杰	fe65067ca2	1. 增加 IOT 接口配置表的 POJO	6 years ago
wei.peng	f6b49bf31a	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
wei.peng	9bea065f35	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
曾贞一	b10b967b73	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
wei.peng	884f3e1a96	合并代码	6 years ago
王杰	aebe742280	mes枚举增加关键件条码规则信息模块的绑定规则	6 years ago
wei.peng	d7b0f30d91	IMPP 平台功能功能优化 . 软适适配功能开发	6 years ago
jimmy.zeng	88f735ff63	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
WYnneaoapc	5e72d98ad8	提交	6 years ago
jimmy.zeng	d340133e7a	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	f56f8d714b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	617bb73dad	增加业务类型字段、修改临时变量字段类型 ... 修改hql查询字段	6 years ago
刘敏	a83b552203	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	60eadfac7a	mes维护页面加模糊查询	6 years ago
刘敏	2bc04b407e	计划日期、时间新增	6 years ago
许心洁	cb49d8d848	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
许心洁	ffb6f8a17c	任务列表不分页，主要查询字段加索引	6 years ago
jimmy.zeng	4359f347c6	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
WYnneaoapc	4ff3677fba	Merge branch 'test' into dev	6 years ago
WYnneaoapc	0aef9adac9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	1328dc7ddd	#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	6 years ago
crish	7ee5312303	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
crish	dd418f8b51	开线信号发送逻辑修改 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
曾贞一	acd1e6cfb6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	ce70994a57	盘点 按照盘点差异类型汇总	6 years ago
jimmy.zeng	a2a4dc6beb	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4d00397411	修改盘点范围的排序规则	6 years ago
汪云昊	e83efe76e0	软件适配器 测试	6 years ago
汪云昊	1d587f831b	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
王杰	3348d5c81a	merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
王杰	e4aadf35ed	mes生产工单页面按钮控制	6 years ago
王杰	4f37dc42ef	pojo-mes-time-update-wangjie	6 years ago
汪云昊	0b13c6dd70	order by 列类型装换	6 years ago
汪云昊	f10ff69ce0	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	1d55cd22a6	order by 列类型装换	6 years ago
汪云昊	39a00d3a19	order by 列类型装换	6 years ago
汪云昊	7eed51791f	软件适配器-定时适配任务	6 years ago
wei.peng	e8741ec364	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
wei.peng	1b30b927ce	自定义表单功能优化	6 years ago
陈思洁	b3a552d65d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	070bacf20e	所有外部单据增加创建时间和创建人的查询条件	6 years ago
曾贞一	7fab9a4d89	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
jimmy.zeng	0d532b78c0	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	2ca432b6a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	e1cb06da5c	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
汪云昊	f2380f6d14	Merge remote-tracking branch 'origin/dev' into dev	6 years ago
汪云昊	02d60ed1a8	软件适配器-数据适配转换	6 years ago
jimmy.zeng	483ea59142	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
刘敏	7a935276a1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
刘敏	bc953bb2c8	查询条件封装	6 years ago
刘敏	de381d438a	领料单模板创建	6 years ago
crish	3711873c29	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
WYnneaoapc	c34a369e93	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	9d70008912	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
曾贞一	61ce4d1b3f	优化	6 years ago
WYnneaoapc	ef1450e912	Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	6 years ago
汪云昊	b9d9d7402e	Merge remote-tracking branch 'remotes/origin/test'	6 years ago
crish	6c37a60ff4	MES-PCN获取平台打印数据 ... Signed-off-by: crish <570360737@qq.com>	6 years ago
jimmy.zeng	ef40914935	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	e9c596adce	盘点hql排序修改	6 years ago
jimmy.zeng	02baed5dbf	Merge remote-tracking branch 'remotes/origin/dev' into test	6 years ago
陈思洁	4573b09392	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	6 years ago
陈思洁	2058789438	盘点业务修改bug	6 years ago