2104 Commits (c1241bd6c5365db34b82f0c2e5123c1cef28753c)

Author	SHA1	Message	Date
alwaysfrin	f4e9a80d79	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
alwaysfrin	14660641ba	hibernate优化	5 years ago
wei.peng	fa42a25b96	异常处理优化	5 years ago
wei.peng	aa1f7a2845	Merge remote-tracking branch 'remotes/origin/test'	5 years ago
钮海涛	4dee474c73	修改POM版本号	5 years ago
钮海涛	417120358c	Merge branch 'test' into dev	5 years ago
钮海涛	288fb4a16b	修改POM版本号	5 years ago
钮海涛	aff68cd087	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	e0a23b147e	mes enum	5 years ago
王杰	3f3d0038e8	【任务：1608 数据监听预警配置，定时任务】	5 years ago
许心洁	4884f59072	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2bc62e2444	动态查询：#需求变更 创建用户和更新用户也需要做成可选的	5 years ago
wynne1005	2e177ba671	dev合并test test有修改	5 years ago
汪云昊	2772ea6a2f	Merge remote-tracking branch 'remotes/origin/dev' into test ... # Conflicts: # modules/i3plus-pojo-andon/pom.xml # modules/i3plus-pojo-aps/pom.xml # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-form/pom.xml # modules/i3plus-pojo-hardswitch/pom.xml # modules/i3plus-pojo-jobflow/pom.xml # modules/i3plus-pojo-lac/pom.xml # modules/i3plus-pojo-mes-pcn/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-ptl/pom.xml # modules/i3plus-pojo-report/pom.xml # modules/i3plus-pojo-softswitch/pom.xml # modules/i3plus-pojo-sweb/pom.xml # modules/i3plus-pojo-wms/pom.xml # modules/i3plus-pojo-workflow/pom.xml # pom.xml	5 years ago
汪云昊	8a8c3ee34d	pom版本调整	5 years ago
wynne1005	581d900123	状态机model提交	5 years ago
曾贞一	35023af12c	【7988 20011--多级包装打印时母条码现在无法打印出来】	5 years ago
汪云昊	e7d176209e	Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev	5 years ago
汪云昊	64d83d238f	Merge branch 'dev' of wei.peng/i3plus-pojo into dev	5 years ago
汪云昊	3fd17208e2	枚举更新	5 years ago
钮海涛	cfd3f8d58f	冲突解决	5 years ago
钮海涛	1d16e2d938	解决合并冲突	5 years ago
陈思洁	30608f886b	解决冲突	5 years ago
陈思洁	d9d2113f75	【MES_增加枚举】	5 years ago
贾文涛	492dfbff82	pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式	5 years ago
钮海涛	53dc57a03e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	df1cbc9449	新增供货追踪接口	5 years ago
袁津哲	bcec12cb38	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	9f918b6664	修改波次规则和范围枚举类字段值名称	5 years ago
王杰	cd99a63233	mes	5 years ago
袁津哲	ae1c6ef8fd	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	8a836e340a	优化枚举查询报错问题	5 years ago
puxiao.liao	d2fb33d888	bug1536【1536 PDA组件修改增加录入车牌信息功能】	5 years ago
曾贞一	c0e3f1cb4f	【找回文件】	5 years ago
王杰	5fc4c6c025	mes	5 years ago
曾贞一	c926992611	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	4dae2eea7d	【MES 导入】	5 years ago
钮海涛	52a5c1e2f8	Merge branch 'test' into dev	5 years ago
wynne1005	351ea8755e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	6a36ad7601	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	1d00303306	自定义报表-折线图,饼图,柱状图,矩形图 完成	5 years ago
袁津哲	15035d2851	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	3529d1b845	枚举类修改规则范围和规则值	5 years ago
zcg	9ab0d784dd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	73f647e3b4	枚举修改	5 years ago
puxiao.liao	f8405b87d9	bug7940【7940 推荐入库-未按最近距离推荐】	5 years ago
钮海涛	3b987436d8	新增LES管理功能	5 years ago
钮海涛	c3a5564652	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
钮海涛	6925ce3b18	任务【1483】：LES-新增拉动规则表 ... 任务【1484】：LES-物料表属性变更 任务【1485】：LES-库位物料属性变更 任务【1486】：LES-存储区属性变更 任务【1487】：LES-生产计划属性变更 任务【1488】：LES-拉动任务属性变更 任务【1489】：LES-入场管理新增窗口时间表 任务【1490】：LES-巡线拉动 任务【1491】：LES-计划拉动 任务【1492】：LES-过点拉动 任务【1493】：LES-手工拉动 任务【1494】：LES-预留外部拉动接口	5 years ago
汪云昊	ec1d52e7dd	MAVEN 版本控制调整	5 years ago
贾文涛	7106c06221	统一修改pom文件的项目版本问题0331	5 years ago
袁津哲	ffbd512b89	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	14cfa5fa47	创建波次计划规则实体类和规则明细实体类	5 years ago
wynne1005	44696061ee	修改pom文件为最新	5 years ago
wynne1005	3c08e7794f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
贾文涛	eed24e0297	统一修改pom文件的项目版本问题	5 years ago
汪云昊	6ed34b9e5f	FTP服务端工具	5 years ago
qianhs	3b763b45cd	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
陈思洁	6e1961c9d8	【mes_增加工位BOM表中的匹配类型枚举】	5 years ago
wei.peng	c8c7c73336	自定义报表 布局,元素,报表 功能优化完成	5 years ago
钮海涛	d98e84759c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	f345ed2b2f	Merge branch 'dev' into test	5 years ago
wynne1005	d80b341620	还原test pom	5 years ago
陈思洁	f14f26a176	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0502f6d736	【任务：1529，料架分组队列展示组件】	5 years ago
陈思洁	35351607f8	【MES_半成品箱条码绑定】	5 years ago
joke.wang	7a6e9b9e21	[任务：1479 料架打印]	5 years ago
钮海涛	d8779f42fb	从dev拉取最新代码	5 years ago
贾文涛	abf5d3eeb9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
贾文涛	048419d823	修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。	5 years ago
zcg	9ca3a819b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wynne1005	4b4bf4e433	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	9d5567f4a6	Merge branch 'test' into dev	5 years ago
许心洁	a22d3d2333	动态查询：#任务1352(合并代码解决冲突)	5 years ago
许心洁	030f2948fb	动态查询：#任务1352	5 years ago
王杰	e3a9defdab	任务1528，生成并打印门锁标签	5 years ago
zcg	98787953ec	【MesPcnEnum 枚举修改】	5 years ago
puxiao.liao	8273a93520	Merge remote-tracking branch 'upstream/test' into test	5 years ago
puxiao.liao	f2c41fc0a6	bug7800【7800 移库单导出时报错导出失败】	5 years ago
王杰	0ca8502751	任务：1518	5 years ago
袁津哲	0c3d14a3f9	wms插件枚举新增按钮增强插件类型	5 years ago
王杰	a9a7d78bd5	解决冲突	5 years ago
wei.peng	549f2ff797	授权拦截功能完成 .	5 years ago
袁津哲	35a4c9039a	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java	5 years ago
袁津哲	2a0204ad99	开发WMS动态加载插件功能	5 years ago
qianhs	564ba1e116	【1472 工步-设备状态采集（原PLC采集【设备状态】）】	5 years ago
陈思洁	cc207240b4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	bacab3fb88	【MES_新增设备工装关系和工装操作记录pojo】	5 years ago
王杰	9f8e51830e	mes enum	5 years ago
joke lin	126440c976	[任务：1435 客户JIT导入]	5 years ago
陈思洁	736b292d83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	310bf49af6	【MES_校验是否换膜并推送换模信号 】	5 years ago
陈思洁	22788f1c44	还原POM文件TEST-DEV	5 years ago
许心洁	8178e90abd	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5bf7133ff1	动态查询：BUG#7845；BUG#7676；BUG#7675	5 years ago
王杰	f5e4bba761	ptlpcnenum	5 years ago
曾贞一	5291d5d13d	【7838 修改分组管理中的按钮名称】	5 years ago
曾贞一	779b9d209c	【修改 DEV-pom.xml】	5 years ago
陈思洁	474bb995d6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	41a39990f4	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
陈思洁	b3e38170e6	【1440 PLC采集工步【生产数据】】	5 years ago
汪云昊	081db93d0d	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	b6a83fff5d	Merge branch 'dev' into test	5 years ago
王杰	0b8c3317b8	ptlpcn enum	5 years ago
zcg	3d28840bae	【新增枚举，pojo】	5 years ago
zcg	b28c092ade	【新增枚举】	5 years ago
luweihao	d1d52ce389	Merge branch 'dev' into test	5 years ago
luweihao	8148b1654f	补上mes枚举	5 years ago
luweihao	16879a4f20	Merge branch 'dev' into test	5 years ago
陆卫豪	a65350bbf8	Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev	5 years ago
luweihao	12579c7a14	还原pom	5 years ago
luweihao	b52bb02d73	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
zcg	9388e3b4f2	【pojo 冲突提交】	5 years ago
luweihao	679319635a	task `1430` 工位扫描，产品信号监听，队列监听	5 years ago
陆卫豪	60ab731ffd	Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev	5 years ago
陆卫豪	d8d48bd913	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
joke lin	5ec9c55784	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
qianhs	65572b34a0	【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】	5 years ago
王杰	999aae6fc0	解决冲突	5 years ago
王杰	78d7861b44	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev	5 years ago
王杰	4b8cd0da38	ptlpcn enum	5 years ago
许心洁	46273325d3	动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）	5 years ago
许心洁	8a98efa9a6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	eaed7962ab	动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ ... 3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）	5 years ago
zcg	bd82a0fba7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke lin	6b9b44995e	Merge remote-tracking branch 'pojo/dev' into dev	5 years ago
曾贞一	38f1bd3b01	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	c0ce05e07c	【7648 在发运界面增加一个打开单据按钮】	5 years ago
曾贞一	2625c2cb0f	【修改 TSET-pom.xml】	5 years ago
joke lin	4823660070	[任务：1435 计划管理]	5 years ago
汪云昊	f2ccb20095	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	a3ecc3132f	表单约束管理	5 years ago
王杰	80ca438ce3	test合并到dev解决pom冲突	5 years ago
王杰	d9e4ea8ea9	Merge branch 'test' into dev	5 years ago
王杰	8ace0c363d	ptl enum	5 years ago
宋军超	d34f3b8215	2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中	5 years ago
钮海涛	669874cb9b	Merge branch 'dev' into test	5 years ago
许心洁	368986e9d8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1d90195de6	3D仓库	5 years ago
曾贞一	5ebb5cbf20	【修改 TSET-pom.xml】	5 years ago
王杰	068a0956db	解决冲突	5 years ago
王杰	b77d3065a4	Merge branch 'test' into dev	5 years ago
王杰	cd19bfb429	ptlpcn	5 years ago
joke lin	cb09776bdb	[任务：1435 计划管理]	5 years ago
宋军超	ac4a8b0ab4	修改ptl数据清除功能	5 years ago
陆卫豪	e43aee2e82	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
王杰	01c5bb59e1	Merge branch 'dev' into test	5 years ago
宋军超	4d701aa9c4	添加ptl数据删除定时任务	5 years ago
zcg	5e78985247	【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突	5 years ago
zcg	7aecf9dcc0	【task 1436 工步-关键件绑定校验并转过程条码】	5 years ago
joke lin	ccf2817788	[计划管理]	5 years ago
曾贞一	0acf2dc0ae	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
钮海涛	35c1114230	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev	5 years ago
钮海涛	ca6e094271	Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev	5 years ago
puxiao.liao	50d3de9b77	7600 二维码零件标签打印功能修改。 ... 7565 收货分组功能要求。 7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 7628 库存调整盘点时，扫描库位后的提示增加一个库位 7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示 7536 没库存时领料与发运的提示修改为下列 7659 创建盘点单冻结条码时条码is_vaild=2 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。 7652 在条码状态报表中增加组号字段显示，查询框也需要增加 7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。 7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。	5 years ago
王杰	880d449dfb	Merge branch 'dev' into test	5 years ago
王杰	b10ddbc958	ptl enum	5 years ago
joke	531596d2d4	[mes: 49 JIT计划与管理]	5 years ago
王杰	e0a018b871	Merge branch 'dev' into test	5 years ago
王杰	dd1e5778a9	ptl enum	5 years ago
王杰	fa9c02705b	ptl enum	5 years ago
王杰	cd8dea1814	ptl	5 years ago
Administrator	797f3b3433	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	906576cb52	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	1e0d88fb0e	动态查询：开窗和时间查询优化+3D仓库基础数据校验优化	5 years ago
钮海涛	de73821fc7	Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test	5 years ago
joke	a7e8e1095d	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	5 years ago
joke	aa403e9691	[ptl-pcn:39 校验物料号]	5 years ago
qianhs	1fc4ae1ff9	1,回退代码	5 years ago
宋军超	e15c2b6065	添加PTL数据同步功能	5 years ago
王杰	1428b5f0aa	ptl	5 years ago
曾贞一	9cc001fd17	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	fe72dc26d9	【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】	5 years ago
luweihao	dd6007656c	Merge branch 'dev' into test	5 years ago
王杰	abb737f265	ptl	5 years ago
王杰	cde65d0e7a	Merge branch 'dev' of gragon.xu/i3plus-pojo into dev	5 years ago
王杰	37d032ca24	ptl反馈信息枚举	5 years ago
王杰	5610a25ab7	ptl反馈信息枚举	5 years ago
汪云昊	31a8a7705a	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	0471038b9b	sqlserver数据库适配	5 years ago
许心洁	a49b747c18	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	cc98e84ba4	动态查询：增加开窗功能	5 years ago
宋军超	80d9852dd6	添加数据同步和定时任务功能	5 years ago
钮海涛	85dff1fde9	Merge remote-tracking branch 'origin/dev' into test	5 years ago
王杰	e1d133de61	ptl enum	5 years ago
宋军超	96c5b35f83	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	0a0318d639	ptl	5 years ago
宋军超	51d666b5bc	开发PTL--PCN节点维护,同步配置和对象映射功能	5 years ago
luweihao	f67dd06cd4	Merge branch 'dev' into test	5 years ago
puxiao.liao	05d0a0a375	【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件 ... 】拣货-更新FIFO推荐组件、更新FIFO检查组件	5 years ago
王杰	644af42dfe	ptl enum	5 years ago
joke	d871869f3a	[ptl-pcn: 32 亮灯作业]	5 years ago
joke	ccd62f8d31	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	d212b5cd30	[ptl-pcn: 32 亮灯作业]	5 years ago
luweihao	66f7121975	Merge branch 'dev' into test	5 years ago
陈思洁	f8d4e7f1fd	【PTL_标签打印pojo新增】	5 years ago
陈思洁	faaf184e01	【PTL_增加主任务状态的枚举】	5 years ago
luweihao	51152656cc	Merge branch 'dev' into test	5 years ago
joke	3c408dd194	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	ab9e9a8638	解决冲突	5 years ago