2341 Commits (bcb4e5ad13425d5b42ff939fdf5ca44f843ca0c9)

Author	SHA1	Message	Date
汪云昊	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
王杰	35efadd243	ptl枚举	5 years ago
joke	f362f9931f	[ptl:32 亮灯作业]	5 years ago
joke	c73cd26574	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
joke	f01b3664c2	[ptl: 32 亮灯作业程序]	5 years ago
宋军超	464c8b68cc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
宋军超	d56756e9e5	添加主任务、区域、区段枚举	5 years ago
陈思洁	728f46b43d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	2c305e0ca6	【修改枚举类名大写（部分）】	5 years ago
许心洁	2a09c009f3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
宋军超	0fe0abff63	新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据	5 years ago
宋军超	896bd9b35b	添加基础数据枚举	5 years ago
jenkins	1ada447069	Jenkins自动合并	5 years ago
qianhs	91b43823c9	【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】	5 years ago
jenkins	9fc85191fe	Jenkins自动合并	5 years ago
王杰	748ef11ccf	ptl-pcn标签控制器枚举	5 years ago
jenkins	499a5ed894	Jenkins自动合并	5 years ago
luweihao	1ec56edcdc	task `1295` mes添加索引	5 years ago
jenkins	1e2029fbbb	Jenkins自动合并	5 years ago
luweihao	0d212df73a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	b6477202e7	新增枚举调用类	5 years ago
jenkins	83a9b74c43	Jenkins自动合并	5 years ago
汪云昊	6d1d41a4a7	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
jenkins	7decc606cb	Jenkins自动合并	5 years ago
luweihao	5afcf20a9e	ptlpcn 添加界面信号枚举	5 years ago
汪云昊	05d6f132ce	表单拾取 ... 任务检查功能优化	5 years ago
luweihao	f358c13b04	ptl迁移4	5 years ago
jenkins	a9d94ecff7	Jenkins自动合并	5 years ago
luweihao	bbfcdfdd64	ptl pojo 提交	5 years ago
jenkins	1a2b706e24	Jenkins自动合并	5 years ago
luweihao	3bed5974f6	ptl pojo init	5 years ago
jenkins	8c5020b098	Jenkins自动合并	5 years ago
曾贞一	9607c91582	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	44648e4218	【1396 亚太-领料任务明细看板】	5 years ago
jenkins	f45a0d69b0	Jenkins自动合并	5 years ago
jokelone	54cd3cfc45	业务表增加唯一索引	5 years ago
luweihao	b27bbb6158	Merge branch 'dev' into test	5 years ago
王杰	3f77135a17	枚举	5 years ago
jenkins	138b2cf7b7	Jenkins自动合并	5 years ago
jokelone	30cb7f7b9d	工单类型去除JIT类型	5 years ago
jenkins	521973a2f5	Jenkins自动合并	5 years ago
zcg	db3b06071d	【枚举修改】	5 years ago
zcg	8a04ca4e3d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	bc1825fd35	【mes枚举修改，mesModel修改,pcn枚举修改】	5 years ago
jenkins	cf44b8866a	Jenkins自动合并	5 years ago
钮海涛	9e0158e749	修改test分支POM配置	5 years ago
jenkins	c90df4e96a	Jenkins自动合并	5 years ago
许心洁	28ce8615fd	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	51d60a107a	SAP指令锁定逻辑修改： ... 根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表； 原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；	5 years ago
jenkins	f927ee21ac	Jenkins自动合并	5 years ago
王杰	bf71cd07d0	JIS发运	5 years ago
jenkins	134757c92b	Jenkins自动合并	5 years ago
wei.peng	32d715a29c	APS 调用失败bug 修复 ... 动态报表 下拉问题修复	5 years ago
宋军超	964afe73cd	2020-01-16 16:42 添加自定义列枚举	5 years ago
宋军超	851067b8d2	2020-01-16 16:37 自定义列表优化	5 years ago
jenkins	d790bcf355	Jenkins自动合并	5 years ago
袁津哲	67ef5c5516	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
袁津哲	89a7cafee4	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	33e68b7e9f	Jenkins自动合并	5 years ago
wei.peng	cb68f62e46	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	8a4974f369	自定义报表 调用调整	5 years ago
jenkins	6371e8df60	Jenkins自动合并	5 years ago
袁津哲	f7c98e3982	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	69ff58a67e	Jenkins自动合并	5 years ago
qianhs	61303a9f38	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	002ce795f4	Jenkins自动合并	5 years ago
luweihao	01a694be70	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
luweihao	6baeeee71e	task `1392` 调整工步 错误处理实现	5 years ago
jenkins	458137d216	Jenkins自动合并	5 years ago
许心洁	fff79a7846	GROUP_COMMIT_MODE枚举漏提交	5 years ago
许心洁	0e54d9a5b6	任务#1403 流程isCommitRefMove属性改为commitMode	5 years ago
jenkins	c1609539cf	Jenkins自动合并	5 years ago
许心洁	de0d57179c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	35839db806	BUG#7359 任务列表分组字段和移动单赋值逻辑更改	5 years ago
jenkins	8f6b53c5ea	Jenkins自动合并	5 years ago
wei.peng	3e31641b20	PTL 项目初始化 ... PTL PCN 项目初始化	5 years ago
jenkins	a0b67a3723	Jenkins自动合并	5 years ago
袁津哲	8285c87624	Wms动态搜索与自定义列表，表单开发	5 years ago
jenkins	7057c685cc	Jenkins自动合并	5 years ago
zcg	2396863bab	【任务:1383 数据监听定时数据抓取】	5 years ago
jenkins	64438ac61c	Jenkins自动合并	5 years ago
qianhs	41047a17c1	【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】	5 years ago
jenkins	8e168c5109	Jenkins自动合并	5 years ago
wei.peng	503f3cd7a3	自定义表单功能优化	5 years ago
曾贞一	5c841c706b	【7201 收货BOP移库流程图】	5 years ago
jenkins	56e53906ec	Jenkins自动合并	5 years ago
jokelone	f1096e9ec5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	51839d7be5	【任务：1381】	5 years ago
zcg	add40a27e3	【任务：1382，数据监听基础模块开发】	5 years ago
汪云昊	536200cf2b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
gcj	cbe87c6bd7	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	c14d6c6916	【宁德问题清单】	5 years ago
袁津哲	7d4ba10449	Wms初始化扫描实体字段新增逻辑优化	5 years ago
jenkins	75dc17f4c4	Jenkins自动合并	5 years ago
jokelone	d0cd9d03b9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0d7aca73a8	【需求：7315 生产工单变更】	5 years ago
王杰	54bdf8f6a0	JIS	5 years ago
e-jiawentao1	9fbc120666	动态搜索与自定义列表初始化扫描Bean字段	5 years ago
王杰	685d7949bf	Merge branch 'dev' into test	5 years ago
zcg	b84a305b26	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	497b963f60	Jenkins自动合并	5 years ago
王杰	bf62494236	JIS	5 years ago
jenkins	fa4cc8610f	Jenkins自动合并	5 years ago
puxiao.liao	8584946ce5	【 条码状态报表，导出时下列三个字段为中文 ... 】bug7196	5 years ago
zcg	c86f3e280e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	f88041df1e	Merge branch 'dev' into test	5 years ago
王杰	3fe50125ae	JIS	5 years ago
jokelone	c226e61acf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	d9990f0cb8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	823f818abf	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
wei.peng	44af186f2f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	af6083ddff	日志存储优化	5 years ago
jokelone	68eb60c6cb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	f38e54e496	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	422aa1835f	Jenkins自动合并	5 years ago
钮海涛	4013ed776b	修复炉资源排程问题	5 years ago
jenkins	dfb06def2b	Jenkins自动合并	5 years ago
曾贞一	9e9d3e2afa	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
曾贞一	5a4510cedb	【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】	5 years ago
qianhs	81bab75132	【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】	5 years ago
WYnneaoapc	adb4bd2a1c	Merge branch 'dev' into test	5 years ago
许心洁	7594b3d515	SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消	5 years ago
jenkins	688d976683	Jenkins自动合并	5 years ago
王杰	8a4aa9fed2	jis发运	5 years ago
jokelone	ebe34e4ba9	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	ad08ff21bb	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	569c2613fe	Merge branch 'dev' into test	5 years ago
wei.peng	f768247c4f	代码合并 2019-12-30 15:59:52	5 years ago
jokelone	39790fd50b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	d47a097c53	【任务：1344 通用接口增加批量数据处理】	5 years ago
zcg	1230906c3e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
wei.peng	3b7b374b23	自定报表对象模型调整	5 years ago
汪云昊	b12f67e34b	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
汪云昊	6b02d9969a	数据源批量写入优化	5 years ago
王杰	7287aaeb77	其他组未提交的代码	5 years ago
jenkins	471016b345	Jenkins自动合并	5 years ago
汪云昊	20ccf65c5c	资源加载优化	5 years ago
汪云昊	d89ed44bcc	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	1d9ab80ae8	数据源适配器 - 批量写入优化	5 years ago
zcg	192034152b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
王杰	3ddadad142	Merge branch 'dev' into test	5 years ago
王杰	019cb91a4c	【需求：1329】	5 years ago
zcg	dbe2d32bb6	[需求：1322，枚举修改]	5 years ago
王杰	91ab421d5e	Merge branch 'dev' into test	5 years ago
jokelone	f857a4065d	【任务：1327JIT生产】	5 years ago
E	e5452056b6	【bug7083 KT器具管理】新增业务类型和作业类型	5 years ago
puxiao.liao	794992d687	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
puxiao.liao	734b54d1b2	【 领料上线扫描时，在扫描完条码后将目标库位带出。 ... 】bug7024	5 years ago
王杰	06afd98334	Merge branch 'dev' into test	5 years ago
jokelone	0e84990f3c	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	20f6961daf	【任务：1327JIT生产】	5 years ago
jenkins	6a19a07fce	Jenkins自动合并	5 years ago
汪云昊	d5c1f7a7a3	资源模块数据 ... 模板软删除 软适配list传参	5 years ago
jenkins	1fbd9c4357	Jenkins自动合并	5 years ago
zcg	dccd104fdd	[需求：1324，excel导出]	5 years ago
jenkins	4e8ee475b4	Jenkins自动合并	5 years ago
gcj	99eaa8b8ca	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/wms/WmsStockFifoModel.java	5 years ago
gcj	fc9b8629ab	【采购收货】	5 years ago
jenkins	cc45dbc2cb	Jenkins自动合并	5 years ago
E	996526ac7c	【bug7088 物料信息中的导入功能】	5 years ago
王杰	90de0f7df6	Merge branch 'dev' into test	5 years ago
王杰	b0709aca97	枚举	5 years ago
王杰	ab68895760	test分支修改pom	5 years ago
王杰	c87b00756f	dev分支修改pom	5 years ago
qianhs	a2ac02aa47	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
E	7ef04dd824	【1320 KT物料信息--需要维护物料的类型：器具】	5 years ago
gcj	a7d1ec785b	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
qianhs	5c28c8344c	【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】	5 years ago
汪云昊	4705b77a7e	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	b674087ffc	资源导入优化	5 years ago
王杰	339f1a86c2	删除枚举代码中间的注释	5 years ago
puxiao.liao	0453363336	【发运配料界面显示将单据数量改为剩余配料数量。 ... 】bug7063	5 years ago
jokelone	e2c9d9e569	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	54fe0ce760	【bug：6360 工厂初始化】	5 years ago
gcj	49134cc5b3	Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
钮海涛	81b84d86e5	新增KPI接口	5 years ago
WYnneaoapc	0191a17a4d	Merge branch 'dev' into test	5 years ago
WYnneaoapc	0103c64247	task `1316` 1 拆分job任务	5 years ago
WYnneaoapc	e206057aba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jenkins	5513e95884	Jenkins自动合并	5 years ago
gcj	01e5919349	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
E	b5006a88f1	【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】	5 years ago
WYnneaoapc	50f77a5081	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	0e1599789d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	d92850c1a4	【运输管理】	5 years ago
WYnneaoapc	a38dc051ac	task `1308` 1 PCN国际化资源	5 years ago
jenkins	03051f4fd1	Jenkins自动合并	5 years ago
许心洁	773f56b577	TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发	5 years ago
汪云昊	1318c6ef56	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
WYnneaoapc	129c84d4a8	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	bc21d0b461	task `1308` 1 PCN国际化资源	5 years ago
陈思洁	5d4e8a94c4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
陈思洁	c5ae91b41e	【KT-1286 计划拉动-计划拉动JOB】	5 years ago
jenkins	55dcb795c9	Jenkins自动合并	5 years ago
许心洁	e816c2fd6a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	258c1ccbe8	流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库	5 years ago
jenkins	1594c49ca9	Jenkins自动合并	5 years ago
zcg	f23b0f7bfe	解决冲突	5 years ago
陆卫豪	3e9c1aaa76	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
WYnneaoapc	7451bc9460	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc	5 years ago
WYnneaoapc	99fd4221e2	task `1304` 1 活化开线管控	5 years ago
jenkins	350f7101d2	Jenkins自动合并	5 years ago
jokelone	f3756e6b34	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	b9b30cf19c	【任务：1306质量标准配置】	5 years ago
WYnneaoapc	b3a04911b6	task `1300` 5 BI 产线运行情况	5 years ago
陆卫豪	5393d6e034	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
zcg	586dfb416b	[mes枚举修改]	5 years ago
陈思洁	40c64db0b1	冲突	5 years ago
陈思洁	ee14ce1d4b	【KT-快速入库功能】	5 years ago
jenkins	015d284239	Jenkins自动合并	5 years ago
puxiao.liao	99a1ec309d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
puxiao.liao	3bfb0995d5	【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 ... 】bug1299	5 years ago
王杰	c4c615bd15	Merge branch 'dev' into test	5 years ago
王杰	3ff9fbc140	安灯图表	5 years ago
WYnneaoapc	b088b40fd1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
WYnneaoapc	a1a602e457	task `1300` 5 BI 产线运行情况	5 years ago
jokelone	6995189893	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	46ec9e51b0	【任务：1211报表导出冗余字段】	5 years ago
jokelone	874fd139dc	Merge branch 'dev' into test	5 years ago
E	59bdec9c6f	【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举	5 years ago
WYnneaoapc	ef34a13313	task `1300` 2 BI 产线运行情况	5 years ago
WYnneaoapc	e3d84dd48f	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	5 years ago
WYnneaoapc	b2daf9fd9c	task `1300` 1 BI 产线运行情况	5 years ago
zcg	d6975bf5de	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	ccfba0fe56	mes枚举修改	5 years ago
jokelone	0dfb948810	Merge branch 'dev' into test	5 years ago
jokelone	519d985838	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
jokelone	0acf17ddd7	【1211：报表1】	5 years ago
许心洁	927579aca5	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
许心洁	fc663ee283	作业流程导入导出BUG#6189	5 years ago
gcj	a6bb80a5a4	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	2e98e17a05	【运输管理】	5 years ago
zcg	7016f20282	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
zcg	7bf8534c16	mes枚举	5 years ago
汪云昊	03d432993a	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
汪云昊	47fb080742	lac线程超时监控优化 ... Session超时时间参数化 lac添加TaskCheck 日志添加索引	5 years ago
陈思洁	7d07580a78	合并冲突	5 years ago
陈思洁	b9844c255b	生产计划表结构增加	5 years ago
gcj	3e6ca8d039	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	5 years ago
gcj	a1a3d1e838	【Bug清单】------------------------------	5 years ago
E	c7d4253e5e	【bug 6872 - 收货、发运看板数据未加载】	5 years ago
王杰	1f4a8d6e55	【安灯修改枚举】	6 years ago
jokelone	a337f1824f	Merge branch 'dev' into test	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
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
jokelone	056dbaacf2	Merge branch 'dev' into test	6 years ago
王杰	fcc2b09559	【安灯修改枚举】	6 years ago
WYnneaoapc	f4b50200b2	bug`6866` 1 打印模板同步	6 years ago
zcg	032260b9f2	[需求：1290，导入excel]	6 years ago
曾贞一	10d8b9626f	冲突解决	6 years ago
曾贞一	cb6fe137d1	【bug6863 生产入库时-如果判断该条码未报工】	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
钮海涛	57b3b4242e	新增表达式录入界面接口	6 years ago
王杰	91730dd195	【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】	6 years ago
jokelone	d835ef1bb5	【任务：1273质量检测标准增加检测项类型】	6 years ago
jokelone	a579358968	【任务：1257下线时间】	6 years ago
钮海涛	5e8e05ddb4	新增表达式录入界面接口	6 years ago
jokelone	690918add5	Merge branch 'dev' into test	6 years ago
曾贞一	1c9f605c56	【VDA成品发运配料-客户发往地】	6 years ago
王杰	5d57bc44d8	更新 'modules/i3plus-pojo-base/pom.xml'	6 years ago
王杰	cfa54aa2b6	修改pom	6 years ago