8914 Commits (b89ceeca0f364de9749e892c061c13d40867929b)

Author	SHA1	Message	Date
钮海涛	7bd17131b5	牵纱拆到手工设备，包布也需要拆到手工设备。	4 years ago
wynne1005	b46bd3b354	feat(core): 平台添加用户名登录方式 支持钉钉授权 ... 平台添加用户名登录方式 支持钉钉授权	4 years ago
廖湘明	e001bbecfe	Merge remote-tracking branch 'origin/test' into test	4 years ago
廖湘明	c19d2aebd5	一次性通过率BUG修改	4 years ago
puxiao.liao	41d09fd259	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	177cdd0b6e	库存条码表增加容器字段	4 years ago
andly.pan	43d7195a37	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
Xiao-yin0517	7a4ab20483	增加了是否禁用和启用	4 years ago
陈思洁	23e5b87ceb	【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】	4 years ago
钮海涛	4088a85a5c	更改左边界计算逻辑：后道工序满模即可开始。	4 years ago
Dominic_Xiao	a0f6fa5a7e	15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29	4 years ago
wynne1005	ac791d518a	fix(impp-framework): 更换redisson注入方式 ... 更换redisson注入方式	4 years ago
joke.wang	49f709959d	15711 19081-邮件提醒内容每一条之间增加换行和序号	4 years ago
曾贞一	697f93a384	Merge remote-tracking branch 'origin/test' into test	4 years ago
曾贞一	3e0df20273	【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】	4 years ago
钮海涛	3dd67766b2	测试时间	4 years ago
joke.wang	eef6f8e18b	节假日 泰国	4 years ago
puxiao.liao	294d34b6d3	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	5cf9c232b5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	dbd14c9d6e	导出模板字段排序维护	4 years ago
钮海涛	c09a078ce4	获取生产计划开始时间和结束时间去除service调用。	4 years ago
joke.wang	0ec0bc2592	15690 19108+PCN 监听工步 记录plc值	4 years ago
joke.wang	db23233a8f	增加容器条码记录表	4 years ago
钮海涛	9ace046d1d	修改动态拆分字段为对象关联	4 years ago
Fightgoo	82b4c948f6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
Fightgoo	021e05ebaf	15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430	4 years ago
钮海涛	99b43a6677	修改枚举	4 years ago
李俊生	efaafcdcc9	仓库物料统计预警	4 years ago
joke.wang	b06b49866f	容器清空接口逻辑优化	4 years ago
钮海涛	b396d9cfd9	修改枚举	4 years ago
钮海涛	e918d85702	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	30048f4ce1	修改枚举	4 years ago
曾贞一	60408db7b0	【15642 19108+wms_printing_queue 新增 part_no 字段+0429】	4 years ago
puxiao.liao	3cf1fd642e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	cd351e443f	15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号	4 years ago
曾贞一	c6e80ad9a7	【3391 添加报废记录报表和修改质检不良清单表-后端】	4 years ago
joke.wang	f20e000957	15608 19081-返工返修-报废单据需要增加字段和数据	4 years ago
陈思洁	2c65486bc6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	dd000b33a3	【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表，但MES还未生成来料检验任务 -20210429】 ... 【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】	4 years ago
andly.pan	6989180c2a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
曾贞一	ac08dc110c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	a92b87f6a0	【3391 添加报废记录报表-后端】	4 years ago
wynne1005	1323569c56	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	0c860de567	feat(SCREEN): 数据对象操作 1 ... 数据对象操作 1	4 years ago
duan.yang	a30e97336c	供应商关系添加物料字段，工厂代码查询条件Bug ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
王杰	844349d583	冲突	4 years ago
王杰	21a3d716f4	pom	4 years ago
王杰	5bf5504992	pom	4 years ago
李俊生	91d7b0157d	零件转换界面增加按钮功能 ... 15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序 15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422 15471 19081-领料任务报表及明细没有拣货完成时间-20210425	4 years ago
joke.wang	5193012b69	15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序	4 years ago
钮海涛	f1159f8afb	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	ae88dda60d	新增MDM对象转换工具。	4 years ago
puxiao.liao	a9881bc01f	修复泰国产品条码统计	4 years ago
joke.wang	92e0acee58	包装明细接口增加索引	4 years ago
Dominic_Xiao	e18b726369	MesPackageTravelRepository 增加 Repository注解	4 years ago
Dominic_Xiao	28d512021e	增加数据源类型字段	4 years ago
simon.song	64d9eef5fc	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	05f805f227	数据迁移功能优化，支持多数据源	4 years ago
joke.wang	ebd3f85255	泰国扭矩展示优化	4 years ago
puxiao.liao	54529730e7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	3c4c271c64	增加产品条码字段信息	4 years ago
肖奕扬	4025c81a8d	Merge pull request '产品工序报表' (#266) from frank.yu/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/266	4 years ago
yumingxing	c5cd0d8a1d	产品工序报表	4 years ago
许心洁	ab8686ae2c	去掉mongo依赖	4 years ago
许心洁	b08ff69d37	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	a735bfc40c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	e7e0580c9a	【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】 ... 【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421 】	4 years ago
许心洁	c4b833a259	合并test分支代码	4 years ago
Dominic_Xiao	10bc144c85	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	62ae1d9a13	包装履历新增qrCode字段，实现卡斯马报表根据工序查询历史CMS标签的功能	4 years ago
钮海涛	508fd77881	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	4f697d51ec	演示问题修复	4 years ago
李俊生	4e87b3000d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
李俊生	9ed1a5d36a	15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 ... 15108 19048-- 库存移动统计可以查看到历史记录 --20210417	4 years ago
puxiao.liao	505f80032c	导入模板下载增加是否必填字段下载	4 years ago
陈思洁	91ab318854	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	a691cded53	【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】 ... 【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421 】	4 years ago
曾贞一	ab0e8d559b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	57a9a8b4fd	【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】	4 years ago
陈思洁	4a3f379a28	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	10ad3e54bb	【15332 20027-PCN端 - 来料检验- 选择检验单报错 -20210421】	4 years ago
joke.wang	8a4698bfe7	15284 19108+ MES无下线汇总报表	4 years ago
钮海涛	63a8aef96d	演示问题修复	4 years ago
汪云昊	ec605315bb	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
汪云昊	862256e751	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
汪云昊	9241c60f07	feat(mdm):通用导入导出及外部应用扩展	4 years ago
joke.wang	fd18ec063f	产品关键数据	4 years ago
puxiao.liao	87f3031a3d	修复软适配枚举	4 years ago
joke.wang	c0ff7ce986	订单池增加索引	4 years ago
许心洁	e1f366f654	喜德任务#3349	4 years ago
许心洁	091a5b3678	流程管家重置提示+喜德任务3349	4 years ago
许心洁	2684b52775	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	a24b40d8ec	喜德任务#3349	4 years ago
puxiao.liao	39b716d2a1	修复打印异常	4 years ago
钮海涛	95dffb65e0	新增成品检验报工	4 years ago
钮海涛	736087852e	新增成品检验报工	4 years ago
陈思洁	77f66de188	【14930 20027-管理端生产包装报表中增加产品二维码查询条件，可以根据产品二维查询出包装条码-20210409】 ... 【14884 20027--控制计划--编辑中选择一行数据点击删除后，不做版本更新。-2021-04-06】 【14848 20027--控制计划--编辑中输入版本号，条件没有生效，点击查询，数据没有按照筛选条件显示查询结果-2021-04-02】	4 years ago
钮海涛	33be7da477	新增成品检验报工	4 years ago
钮海涛	4590133c27	新增成品检验报工	4 years ago
github33	4854673754	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
wynne1005	9c4b233975	refactor(core): 支持用户密码过期 ... Finish 21.4.8	4 years ago
wynne1005	afc0138e83	refactor(core): 支持用户密码过期 ... commit1 21.4.7	4 years ago
github33	be26c0920f	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
puxiao.liao	6030c67021	打印数据查询修改	4 years ago
github33	63dc4a2f9f	14850 20027-mes查询 wms的熔深batch的接口-20210409	4 years ago
钮海涛	984f772788	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	8b75ed1cfc	新增报工功能	4 years ago
曾贞一	f15f85b56d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	6ffd586274	【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】	4 years ago
曾贞一	b688f4aff5	【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】	4 years ago
wynne1005	5b003a613b	screen修改关系表名 增加历史表	4 years ago
puxiao.liao	93226dd915	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	eacbdbaa7d	20027--MES看板-班组数来源班组信息，需要班组信息中增加一个字段来维护班组人数-2021-04-02	4 years ago
钮海涛	543433bfff	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9ee464f67e	新增报工功能	4 years ago
joke.wang	bddd4b37a2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	52b2ea43da	14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值	4 years ago
陈思洁	2b2761ade2	【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】	4 years ago
joke.wang	ca8bfd3f53	泰国扭矩采集	4 years ago
wynne1005	64c2ed920f	修改通用界面端口 还原第三方数据库连接字符串中的时区	4 years ago
wynne1005	0ba5c62931	Merge branch 'screen' into dev	4 years ago
wynne1005	714a32a994	first commit	4 years ago
Dominic_Xiao	f12c568119	天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值	4 years ago
Dominic_Xiao	cc86a60ba7	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	9eba8f1683	天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段	4 years ago
joke.wang	072bc431fb	扭矩采集	4 years ago
shun	1fbccdcf40	查询移库单增加供应商名称	4 years ago
simon.song	3c6a7b410d	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	5554bfd14c	14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17	4 years ago
puxiao.liao	2adc935bb0	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-mes-pcn/pom.xml sonar-project.properties	4 years ago
钮海涛	23f6f9285b	增加4车间补满模逻辑	4 years ago
许心洁	4f919011dc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
github33	9a4aae9f68	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
github33	a61f2c1778	CYCLE_RULE--新增枚举	4 years ago
王杰	38d03b1060	状态机优化	4 years ago
wynne1005	7767630fbb	tmp	4 years ago
wynne1005	15633bc28e	tmp	4 years ago
陈思洁	9e0d03629c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	281957a6f5	【3324 泰国-扭矩采集 --PC端后端】	4 years ago
joke.wang	3d0d39ac1d	Tha扭矩采集	4 years ago
陈思洁	ccf221f80b	【pojo改名字】	4 years ago
陈思洁	39ced0a83d	【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】	4 years ago
汪云昊	1ef29d1fce	revert(pojo):还原pom版本	4 years ago
汪云昊	1eae64bafe	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	95052a4e78	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	46e068ccdb	feat(softswitch):REST按状态码重试	4 years ago
joke.wang	7f8dd50412	物料关系表	4 years ago
wynne1005	a44a4a8be3	Merge branch 'dev' into test	4 years ago
wynne1005	d97a855e83	移除screen	4 years ago
Dominic_Xiao	9fc68bc443	14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型	4 years ago
汪云昊	4272aad4ac	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	d45d5175dc	feat(softswitch):REST按状态码重试	4 years ago
wynne1005	44f61e1525	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	385156cd18	refactor(core): SSO 支持方式变更	4 years ago
Dominic_Xiao	e58ffc9d69	天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段	4 years ago
汪云昊	fc28ea2346	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
钮海涛	ffa0aa94f8	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	caafb9c317	修改排程计划逻辑	4 years ago
汪云昊	2443d1d8e6	feat(softswitch):REST按状态码重试	4 years ago
Dominic_Xiao	ce91ea879f	天津-PCN新增功能:物料校验客户标签	4 years ago
许心洁	f363979f24	任务#3328	4 years ago
wynne1005	f21c618f70	feat(Screen): pojo建立 ... pojo建立	4 years ago
puxiao.liao	cc8d2a5441	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
simon.song	f73570b28e	漏提交代码	4 years ago
puxiao.liao	f9c3fc705b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	4ceb2b70c7	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	d129a3863b	天津-新注塑区域集中下件	4 years ago
simon.song	2dc6a886fe	14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题）	4 years ago
joke.wang	cd5773fb2e	绑定关键件增加显示列	4 years ago
王杰	e40744e65a	Merge branch 'test' into ext-dev	4 years ago
王杰	f8e0146b19	pom	4 years ago
王杰	af11605d46	工步	4 years ago
钮海涛	257647de0a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	0af24e4704	新增生产计划下发，生产计划打印功能。	4 years ago
曾贞一	f05c9bfaa4	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
曾贞一	05ce6976e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	18b9a8c6c9	【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】	4 years ago
joke.wang	6a00f4f7f9	14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序	4 years ago
汪云昊	46d94c051a	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
汪云昊	af4ce0fa32	feat(impp):组织结构添加事业部节点	4 years ago
钮海涛	1072a62f79	PDA首页增加目标存储区显示	4 years ago
钮海涛	ec35afa34e	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9f12a44fb6	完成插单功能	4 years ago
puxiao.liao	aec66afa83	修复泰国翻包	4 years ago
andly.pan	5859716998	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
andly.pan	5e98df411e	更改重置参数 ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
wynne1005	8b1e28c893	删除mongo依赖 merge test	4 years ago
wynne1005	bbb4d57abc	删除mongo依赖	4 years ago
wynne1005	d627d024a7	移除mongo依赖	4 years ago
wynne1005	62d9679308	删除mongo依赖	4 years ago
wynne1005	b48f30fd47	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
汪云昊	960ec37cbc	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
汪云昊	a067683998	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
puxiao.liao	2da5b569a6	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
puxiao.liao	29ee22da5d	软适配定时任务的修改	4 years ago
andly.pan	4261e9d34e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
andly.pan	faeef7b511	swebplanOrder增加过期字段 ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
汪云昊	2fd80792ba	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
汪云昊	c60daac399	feat(mdm):mdmhql工具调整	4 years ago
钮海涛	be664bf464	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	a63334c5a1	去除事务sop	4 years ago
wynne1005	31f26f5b4f	Merge branch 'dev' into test	4 years ago
wynne1005	b8d254e55e	增加平台配置类型	4 years ago
joke.wang	19872ba443	隔离报废	4 years ago
陈思洁	c2dbff5d5a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	6b4ae7eb71	【3254 泰国-上装总成套膜标签打印】	4 years ago
joke.wang	0c4e6359fc	JISA导入优化	4 years ago
joke.wang	fbab36aad2	报废隔离	4 years ago
andly.pan	754124ff25	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
汪云昊	c6031a0fc4	feat(softswitch):添加sap-rfc适配器	4 years ago
wynne1005	6adc396aef	删除动态表单的元素样式类型	4 years ago
wynne1005	dce748fdd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	2a63c05597	删除动态表单的元素样式类型	4 years ago
wynne1005	4d40686be8	删除动态表单的元素样式类型	4 years ago
曾贞一	54e691bc30	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	2e49522aec	【14115 20063-BH基础数据增加导出及导入功能-20210305】	4 years ago
joke.wang	24aa100dfe	追溯总览报表	4 years ago
wynne1005	1f94eee641	Merge branch 'dev' into test	4 years ago
许心洁	ab05112dc4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	efebc6f605	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	154307b2f0	【泰国工位传参修改】	4 years ago
许心洁	2127e3d260	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
joke.wang	339cbf0634	bug:14146 一张报表中查询产品所有追溯信息	4 years ago
许心洁	4ae7700104	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	44af0f4e80	删除重复实体类	4 years ago
puxiao.liao	5b3046f482	天津麦格纳BUG修复	4 years ago
joke.wang	d7da6437b3	获取状态机dao bug修复	4 years ago
钮海涛	919db8451e	导入问题修复	4 years ago
王杰	4d81424794	numberrule	4 years ago
王杰	5e290e81b8	number rule	4 years ago
wynne1005	8c3a652ada	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	6318ca6afc	feat(form): 动态表单新增跳转详情页枚举	4 years ago
simon.song	dbeb6baac7	14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28	4 years ago
joke.wang	f01ae5106b	14165 返修队列增加校验	4 years ago
钮海涛	7d47979fe1	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	f31071afc6	add export function	4 years ago
王杰	6b7cfa6659	Merge branch 'test' into ext-dev	4 years ago
王杰	3cd06f5be3	pom	4 years ago
许心洁	d223ff242d	BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失	4 years ago
王杰	04756b1a6d	Merge branch 'test' into dev	4 years ago
钮海涛	52644c1deb	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	f10f13a8de	add import field	4 years ago
许心洁	38e6870f04	Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
puxiao.liao	a98066dbe8	接口增加字段信息	4 years ago
王杰	431ee97d64	同步工单表	4 years ago
王杰	f4e9bf4603	Merge branch 'test' into ext-dev	4 years ago
王杰	94d38bb175	test merge dev	4 years ago
王杰	fe6940b0dc	编码规则扩展	4 years ago
joke.wang	b505fe8456	13858 20027--接口表同步情况报表	4 years ago
joke.wang	e2a9222b47	pcn登陆限制	4 years ago
曾贞一	76079c9bee	Merge branch 'test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java	4 years ago
puxiao.liao	485fe13202	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	c880d51c9d	修复泰国翻包	4 years ago
钮海涛	90169cd8b0	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	2ba2314968	add import field	4 years ago
曾贞一	c63df1ed7f	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
Dominic_Xiao	0c9dff6dd8	不良品处理根据物料类型查询位置	4 years ago
Dominic_Xiao	c1eb51dec5	缺陷位置新增产品类型字段	4 years ago
王杰	dbc417269b	test merge ext-dev	4 years ago
王杰	03d95e2591	Merge branch 'dev' into test	4 years ago
王杰	e66a560661	冲突	4 years ago
王杰	ec3d2f8557	pom	4 years ago
王杰	4644639c2e	pom	4 years ago
王杰	c06902f8de	冲突	4 years ago
曾贞一	462ed4f1de	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
曾贞一	7b3ef8f268	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
曾贞一	5af6f3ae7f	【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】	4 years ago
钮海涛	7cda94ab0c	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	0b354ef001	add import template	4 years ago
王杰	096e2fc8bf	test merge ext-dev	4 years ago
王杰	f0c09ca0e6	Merge branch 'test' into dev	4 years ago
王杰	2b89e35c69	pom	4 years ago
王杰	78b5bb0c08	Merge branch 'test'	4 years ago
王杰	7111a3b60f	pojo	4 years ago
simon.song	ca8ca18f34	数据同步接口修改查询条件	4 years ago
许心洁	1367584df0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	cf83ab060d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
simon.song	24bd5ab668	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	4 years ago
simon.song	ff5348bf99	中航看板取值修改	4 years ago
simon.song	9c51146117	数据迁移接口修改	4 years ago
王杰	5a0927299b	新建表报错 bug	4 years ago
simon.song	78a96c6583	mes管理端增加数据迁移功能相关接口	4 years ago
许心洁	5fae039262	合并测服代码	4 years ago
许心洁	55ba26ad22	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	22c55fc8c6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
joke.wang	e967dde7a3	总屏幕看板优化	4 years ago
Dominic_Xiao	553fb09bc0	修改hql去除多余工厂代码条件	4 years ago
许心洁	071b0ea9ce	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... # Conflicts: # sonar-project.properties	4 years ago
许心洁	410b95aefd	Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms ... # Conflicts: # modules/i3plus-wms-apiservice/pom.xml	4 years ago
simon.song	db0d184aa3	数据迁移功能完成。	4 years ago
肖奕扬	9f0dfdb1fd	Merge branch 'test' of frank.yu/i3plus-pojo into test	4 years ago
Dominic_Xiao	cf908f2d04	卡斯马基础界面--客户条码规则、产品容器容量配置	4 years ago
puxiao.liao	696a0a8c3f	修复单据条码展开日期	4 years ago
钮海涛	3b8a5482ad	add sanlux project	4 years ago
王杰	25303ffc55	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	4 years ago
王杰	5a5874b137	test	4 years ago
王杰	45a1b63a23	Merge branch 'test'	4 years ago
王杰	84d9ec15f2	pom	4 years ago
王杰	f1db936f42	pom	4 years ago
王杰	d2f03a966e	Merge branch 'dev' into test	4 years ago
joke.wang	5e1fac42fe	12112 设备周期作业计划需要与作业要求进行关联	4 years ago
yumingxing	86a6fb1390	报表2021026	4 years ago
钮海涛	8c4bf4b0fe	修复导入excel大数据问题	4 years ago
yumingxing	ca50493d20	报表20210125	4 years ago
puxiao.liao	c8d97daa58	Fix bug#13248	4 years ago
puxiao.liao	983565aca1	Fix bug#13752	4 years ago
joke.wang	378993b225	包装条码补打优化	4 years ago
王杰	0183ca2a05	Merge remote-tracking branch 'i3plus-pojo/dev' into dev	4 years ago
陈思洁	85ebb5ce78	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	01877b80d5	【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】	4 years ago
Dominic_Xiao	81e63fe7d2	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	c5d56b2c32	炉内位置信息新增方向字段	4 years ago
wynne1005	665a89a8ae	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	5b2f57450b	feat(core): 松下GID单点登录需求 ... 支持E9方式的SSo	4 years ago
joke.wang	5d25ecc9b5	13829 mgn-bj 补打页面优化	4 years ago
钮海涛	fe0a83a8fe	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	1bc4c491b6	修改导入功能	4 years ago
许心洁	3cfa736132	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
王杰	fba7f636d9	状态机	4 years ago
王杰	1e6691c8b5	Merge branch 'test' into dev	4 years ago
joke.wang	e779b5e482	成品标签打印修改	4 years ago
joke.wang	acaeb348e1	标签基础页面	4 years ago
许心洁	07481f7197	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	896a88de44	合并测服代码	4 years ago
王杰	c8b21c0b69	pom	4 years ago
王杰	1a0e581921	Merge branch 'dev' into test	4 years ago
肖奕扬	8a6524ada7	Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	d8aac51ef5	【排序序号--滑道】	4 years ago
陈思洁	3997ae3e93	【排序序号--滑道】	4 years ago
yumingxing	70b4bc75e8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
yumingxing	428f98955d	报表20210118	4 years ago
肖奕扬	20809ff985	Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	8246a28c05	Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
Dominic_Xiao	a8fafb2443	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	db204080a8	滑道工厂新增"客户代号"与"客户抬头"字段	4 years ago
许心洁	8cd32346d3	BUG#13694,喜德BUG：单据条码展开没有查询seqNo导致无法生成条码	4 years ago
许心洁	c45cd70ea9	喜德BUG：单据展开查询没有返回seqNo导致不能生成条码	4 years ago
puxiao.liao	7333a8f762	Merge remote-tracking branch 'origin/test' into test	4 years ago
puxiao.liao	8eb1831861	Fix bug#12607	4 years ago
yumingxing	0871833d26	报表20210115	4 years ago
yumingxing	479b81cb08	报表20210114	4 years ago
yumingxing	b1df64bff5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
yumingxing	53b72a8f8d	报表202101141821	4 years ago
王杰	fb4b10e689	涂装质检 待定 重构	4 years ago
许心洁	d107c7a3fe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo	4 years ago
陈思洁	74947bfaf8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	abe5ae9f9b	【13524 20027--首、巡、末检的检验项内容需要增加排序字段，现首巡末检的检验项是没排序的，需要按照新增的排序字段进行排序】	4 years ago
yumingxing	fcbf1467b2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
yumingxing	deedd2f2ef	报表20210114	4 years ago
许心洁	02137638e4	喜德BUG:单据条码展开没有查询出单据明细的SEQNO，导致工单条码无法生成	4 years ago
joke.wang	0a389480f3	13696 新增不良维修记录报表	4 years ago
wynne1005	d9029eb690	BlockForm 添加table-formatter字段	4 years ago
wynne1005	6f49603fee	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
肖奕扬	0ee06f6e03	Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	2679582bc3	中航新增关闭开线检测功能	4 years ago
肖奕扬	0d7c71d5db	Merge branch 'test' of frank.yu/i3plus-pojo into test	4 years ago
Dominic_Xiao	bfd5b0ab9d	新增滑道工厂基础模块	4 years ago
yumingxing	9202937516	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
yumingxing	2cd3547637	报表优化	4 years ago
joke.wang	d93c9fe6a6	物料表增加冗余字段	4 years ago
许心洁	ca5cc4937e	需求#1391	4 years ago
rock.yu	8be0df57ea	Merge remote-tracking branch 'origin/test' into test	4 years ago
rock.yu	ad2c771996	ERP快照相关的表切换为从BaseBean继承，解决SnapID重复的问题	4 years ago
廖湘明	af3eeec75b	限制最大查询条数，零件号改成客户零件号	4 years ago
廖湘明	d6ed0a40a1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
廖湘明	d721b2845f	限制最大查询条数，零件号改成客户零件号	4 years ago
puxiao.liao	692782178e	Merge remote-tracking branch 'origin/test' into test	4 years ago
puxiao.liao	1f3f891264	二维码优化	4 years ago
廖湘明	b2459ba8ec	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
廖湘明	abca1558da	零件号属性换成客户零件号	4 years ago
陈思洁	c475abc39d	【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】	4 years ago
陈思洁	32fe7ffac7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	193c4a254c	【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】	4 years ago
joke.wang	1ed47f1526	工单条码补打查询优化	4 years ago
许心洁	6fab12fc50	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	e72c2dd09a	任务#2586	4 years ago
yumingxing	ca708c3f2d	需求变更报表修改	4 years ago
puxiao.liao	b379826423	Merge remote-tracking branch 'origin/test' into test	4 years ago
puxiao.liao	d486da1120	增加二维码生成功能	4 years ago
陈思洁	90bfcd6d46	【Bi 界面bug修复】	4 years ago
陈思洁	72cb3a0cd5	【Bi 界面bug修复】	4 years ago
王杰	7f6281f63e	报工数据查询报表	4 years ago
钮海涛	76cf0be79d	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	7d8fd15370	修复坤泰问题	4 years ago
陈思洁	a7882ffdb9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	10ae503952	【泰国需求变更】	4 years ago
汪云昊	b03d4bf573	Merge remote-tracking branch 'origin/dev' into test	4 years ago
王杰	45a7ff6132	天津组装看板	4 years ago
duan.yang	752146bc27	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
duan.yang	63fc619c74	同步标识 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
汪云昊	1ea73e877f	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	cb9add43a3	feat(sms):短信模型，枚举调整	4 years ago
肖奕扬	4565693c67	Merge branch 'test' of frank.yu/i3plus-pojo into test	4 years ago
yumingxing	1871c738e3	报表BUG	4 years ago
肖奕扬	90d12235cf	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	4 years ago
廖湘明	08c9f486c4	日期条件验证	4 years ago
duan.yang	c2eac0f71c	同步标识 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
simon.song	33f0e4b381	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	6532ac13b6	中航新增读取第三方DB工步	4 years ago
肖奕扬	6fc51c20f2	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	4 years ago
廖湘明	87c2c3b156	翻译枚举	4 years ago
shun	b7f3b931a0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
shun	9cdf5827a3	JIS发运报表增加导出枚举	4 years ago
钮海涛	2740830e8f	合并test代码	4 years ago
simon.song	d824e42085	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	6f0a831d20	中航看板优化	4 years ago
simon.song	9c1bd71675	中航产线看板：过程检验优化	4 years ago
shun	dfaa9c810b	JIS发运报表增加导出model	4 years ago
陈思洁	5d79dd413a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	6f5204d536	【13526 20027--产线管控中增加一个开线检测按钮用于临时开线-2020-12-30】	4 years ago
Dominic_Xiao	c72a294a6f	回滚POM	4 years ago
肖奕扬	9f25d80eac	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	4 years ago
Dominic_Xiao	1efcd63ca5	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	6d3fa2aa50	物料上炉模式新增方向字段	4 years ago
puxiao.liao	66671bafb8	Fix bug#13581	4 years ago
andly.pan	ddb6fa33d3	条码增加道口泊位 ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
shun	987fa02e32	自动打印增加重量	4 years ago
廖湘明	860a995022	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
廖湘明	411c497eef	代码优化，包装查询修改hql	4 years ago
joke.wang	1c8c945f8e	Tha 工单打印	4 years ago
shun	33b05c090c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
shun	36f37a4444	无锡喜德看板优化	4 years ago
许心洁	b3a7d77087	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	abc5a9b812	BUG#新增需求：13580	4 years ago
joke.wang	b702c92c42	半成品报表	4 years ago
陈思洁	76f8675ac1	【13525 20027-QMES首页“产线一次合格率”没有根据“日月年”筛选条件查询数据-20201230】	4 years ago
wynne1005	32ed3d388f	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	7609d3449c	添加lob字段	4 years ago
shun	ad0ddbf65e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
曾贞一	5ebb37173d	Merge remote-tracking branch 'origin/test' into test	4 years ago
曾贞一	aae3fb2539	【未完成单据提交-优化】	4 years ago
simon.song	f51ad83cc0	返修记录报表查询条件去掉模糊查询，增加【产品条码】查询条件	4 years ago
王杰	58c7b6854b	pom	4 years ago
曾贞一	2e13f7e3f9	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
曾贞一	bbd5dccbf8	【合并分支】	4 years ago
Dominic_Xiao	5e8e563a81	修改基础模块:炉子图片由与位置绑定改为与模式绑定	4 years ago
钮海涛	a82d657366	修复坤泰问题	4 years ago
simon.song	9dbfc00e6f	13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29	4 years ago
simon.song	9ba8ae781d	13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29	4 years ago
陈思洁	f4ffa95c4b	【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】	4 years ago
Dominic_Xiao	11e2d8e9f9	卡斯马报废率趋势报表	4 years ago
王杰	b25641e02b	数据复核	4 years ago
puxiao.liao	db8c01b64c	修复天津BUG	4 years ago
王杰	0906539b82	总装 数据复核	4 years ago
许心洁	a9fc8ae132	喜德WMS：BUG#13293，13295，13294	4 years ago
钮海涛	b843db89d9	静态盘点查询单据查询不到数据问题修复	4 years ago
陈思洁	d1532067b7	【3063 不良品处理模块-添加基础配置界面 --后端】	4 years ago
puxiao.liao	129002573c	Fix bug#13399	4 years ago
duan.yang	0db629a2a1	BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
王杰	605d620565	工位跳过记录	4 years ago
puxiao.liao	8657926eee	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
puxiao.liao	4937b49281	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
王杰	183a642c52	天津 安灯类型 增加 模具	4 years ago
puxiao.liao	36d4f0ac10	修复天津麦格纳问题	4 years ago
陈思洁	8edd1cc336	【3057 包装履历报表 - 后端开发】	4 years ago
钮海涛	d301332162	合并dev代码	4 years ago
yumingxing	1081b3a972	报表	4 years ago
Dominic_Xiao	0cec15c1ba	修改基础模块:炉子图片由与位置绑定改为与模式绑定	4 years ago
simon.song	4e78dc93b0	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	0ee41dbda1	13500 20027--质量经理BI---产品过程检验--如图首检是完成的，但查询首检、末检的检测结果报表，结果显示首检是完成合格的，末检是未完成的---2020-12-29	4 years ago
钮海涛	eea1084f84	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	6bfc2f92b0	修复坤泰问题	4 years ago
simon.song	a86a189fc3	13493 20027-控制计划--点击编辑，导入数据优化--2020-12-29	4 years ago
Dominic_Xiao	e62bdb1f60	Merge remote-tracking branch 'remotes/origin/dev' into test	4 years ago
王林	03aefdfd9b	Merge branch 'dev' of frank.yu/i3plus-pojo into dev	4 years ago
yumingxing	04df1faa4f	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
Dominic_Xiao	46bbe0492d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
Dominic_Xiao	6bd2d191a3	卡斯马报废率趋势报表	4 years ago
廖湘明	7f76e2ac02	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
陈思洁	b7a0966a16	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	9a8515eeb9	【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】	4 years ago
廖湘明	747312eaa3	1.包装查询报表 ... 2.一次性通过率报表	4 years ago
yumingxing	7857ba714c	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
yumingxing	e178bb8c67	生产统计报表+报废占比柏拉图报表	4 years ago
王杰	cafac4312b	数据复核	4 years ago
陈思洁	587e4f5db1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	3a98640d5d	【3063 不良品处理模块-添加基础配置界面 --后端】	4 years ago
王杰	2e03c7b3f5	Merge branch 'dev' of frank.yu/i3plus-pojo into dev	4 years ago
钮海涛	70b80068c2	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	56630ccb0d	静态盘点查询单据查询不到数据问题修复	4 years ago
puxiao.liao	7880fc96c9	修复天津BUG	4 years ago
廖湘明	5e43c32131	1.包装查询报表 ... 2.一次性通过率报表	4 years ago
廖湘明	29500d8762	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
廖湘明	61364e2170	包装查询报表	4 years ago
汪云昊	2cfbe85ab6	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	718466b8df	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
汪云昊	60ef8f3b96	feat(sms):平台短信功能	4 years ago
许心洁	8c26a27218	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	819a4312ae	喜德WMS：BUG#13293，13295，13294	4 years ago
王杰	5a0c89f79b	Merge remote-tracking branch 'i3plus-pojo/test' into test	4 years ago
王杰	b20fc8e552	总装 数据复核	4 years ago
陈思洁	fefa52c9d2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	04f1da7f3f	【3057 包装履历报表 - 后端开发】	4 years ago
puxiao.liao	7e400a1a68	Fix bug#13399	4 years ago
duan.yang	f210767332	BUG #13415 19058-坤泰环境，生成装车单时需要把原出库单号作为关联号显示在界面上 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
王杰	2ccee2523a	工位跳过记录	4 years ago
yumingxing	1bebe59cc2	产品履历报表+全工序报废率报表	4 years ago
puxiao.liao	87dcbd64f8	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
puxiao.liao	4e0cab2f6a	Fix bug#13411 ... ASN收货后未点击提交按钮，再次进入后无法提交	4 years ago
puxiao.liao	d7d387e77c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	f63baa9c1a	天津 安灯类型 增加 模具	4 years ago
puxiao.liao	7fcdae795c	修复天津麦格纳问题	4 years ago
yumingxing	6b443a7d04	产品履历报表+全工序报废率报表	4 years ago
yumingxing	404cab525a	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
yumingxing	13ca332c4b	产品履历报表+全工序报废率报表	4 years ago
钮海涛	baed7db4ed	合并dev代码	4 years ago
钮海涛	48b4e45850	Merge remote-tracking branch 'remotes/origin/test' into dev	4 years ago
钮海涛	6e5ea4462f	合并master代码	4 years ago
钮海涛	977b8ac23c	Merge remote-tracking branch 'remotes/origin/test'	4 years ago
钮海涛	05dca352dd	修改订单履历功能	4 years ago
puxiao.liao	268c04ddf3	Fix bug#13229	4 years ago
yumingxing	4ec01b61f7	产品履历报表+全工序报废率报表	4 years ago
joke.wang	50558289e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	b58904bd94	国际化优化	4 years ago
simon.song	cbf86c2f7e	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	cb51636bd2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
simon.song	c016cb734b	去掉模糊查询	4 years ago
puxiao.liao	6c2569ee92	盘点优化	4 years ago
钮海涛	ded63e25db	坤泰问题修复	4 years ago
陈思洁	cf109c6773	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	419fe3a62e	【13330 20027--BI详情----产线运行情况--计划完成率浮窗显示内容优化--2020-12-18】	4 years ago
simon.song	3c6b869821	13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18	4 years ago
simon.song	fa9a989cbd	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	23bbde2057	13315 20027-返修记录报表增加显示产品二维码-202012-26	4 years ago
shun	c067c671a9	无锡喜德	4 years ago
simon.song	ade9053502	13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18	4 years ago
Dominic_Xiao	97e919552a	修改基础模块的描述名	4 years ago
shun	6f9d4b4342	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	d089d0fba8	Merge branch 'test' into dev	4 years ago
陈思洁	107f3828f9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	cc99971690	【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】	4 years ago
许心洁	1595f68723	任务#3036	4 years ago
王杰	7e8970f3e2	数据复核	4 years ago
shun	fb4e79b899	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
shun	2fd1b89425	无锡喜德WMS看板	4 years ago
王杰	cd5b882e1f	dev merge test pom 冲突解决	4 years ago
simon.song	0b1ef2290d	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	d648228b18	13300 20027-控制计划--点击生效没有响应--2020-12-16	4 years ago
joke.wang	95e92168d9	物料追溯批次model	4 years ago
joke.wang	c0d3eb807f	物料批次追溯报表	4 years ago
廖普小	c45d4e8aaf	Merge branch 'test' of channing.zhang/i3plus-pojo into test	4 years ago
钮海涛	4116dc6b91	修复坤泰问题	4 years ago
许心洁	3f72f2ac66	合并TEST分支代码	4 years ago
许心洁	3cf59e9edc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	88d2eefcc8	供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复	4 years ago
liangyao	9f1312e906	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	ae2469e463	北京领料任务提交	4 years ago
许心洁	3d1d05ef1c	1.天津委外发运库存移动单打印	4 years ago
许心洁	1474be7486	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
许心洁	30a6ef7ba5	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
许心洁	3467893051	1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读 ... 2.更正生产计划对象属性woekorderNo->workOrderNo 3.将脚本异常往外抛 4.优化通用脚本接口	4 years ago
曾贞一	15452dfa0e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	b695ab2fc3	【10202 20011--发运一步法配料时】	4 years ago
王杰	08a458cee2	unpack	4 years ago
钮海涛	56876e8cba	修复天津麦格纳问题	4 years ago
钮海涛	cfcde79f1f	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	230895c243	修复天津麦格纳问题	4 years ago
puxiao.liao	45201c42d3	盘点优化	4 years ago
wynne1005	b7c4e76163	增加joined注解	4 years ago
puxiao.liao	eb56d52e17	盘点优化	4 years ago
钮海涛	7a7169386a	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	c4023d4bac	坤泰问题修复	4 years ago
joke.wang	ef971201e3	泰国新条码生成	4 years ago
puxiao.liao	0bb69b6505	优化盘点	4 years ago
钮海涛	3b700e722c	Merge remote-tracking branch 'origin/test' into test	4 years ago
wynne1005	b438735172	Merge branch 'test' into ext-dev	4 years ago
rock.yu	2f912b2334	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
rock.yu	fe23cab34b	增加实体扩展注解	4 years ago
钮海涛	231c4b015a	修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题	4 years ago
wynne1005	78d86be2f5	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	8741facd02	中航BI修改 数据同步打印错误日志	4 years ago
joke.wang	b37456b227	删除错误提交	4 years ago
joke.wang	85c22ea8bd	电泳上线	4 years ago
陈思洁	1643d57b99	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	a014d8ceaa	【13137 19048 安灯类型没有在看板中展示 20201209】	4 years ago
simon.song	6acd271c31	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	4a120ca375	12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124	4 years ago
汪云昊	23e1eb13a1	Merge remote-tracking branch 'origin/dev' into test	4 years ago
汪云昊	23f24d297d	fix(core):单号生成未正常重置	4 years ago
wynne1005	fd7ef3285f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	6472ebddba	mes枚举格式优化	4 years ago
puxiao.liao	9cd011c6ca	修复盘点BUG	4 years ago
wynne1005	9242285b4c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	b09a09f70b	修改mes工位监控 异常停止不能复位问题 bi相关问题	4 years ago
joke.wang	c286c3d319	容器扫描工步逻辑修改	4 years ago
liangyao	88aea83c1a	北京领料任务提交	4 years ago
陈思洁	981438c2a2	【12997 19048-条码补打查询不到二检箱标签-20201204】	4 years ago
simon.song	effc34f74d	Merge remote-tracking branch 'remotes/origin/test' into ext-dev ... # Conflicts: # modules/i3plus-pojo-mes-pcn/pom.xml	4 years ago
许心洁	d4696b54a3	墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举	4 years ago
simon.song	4f593ea352	Merge remote-tracking branch 'origin/test' into test	4 years ago
liangyao	4b79ab806e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	4eef481c90	Merge remote-tracking branch 'origin/test' into test	4 years ago
puxiao.liao	0c50abaea8	修复条码状态查询异常	4 years ago
钮海涛	8c7da1c65a	Merge remote-tracking branch 'origin/test' into test	4 years ago
钮海涛	3b3f0c98db	修复坤泰问题~	4 years ago
simon.song	4676a84b07	删除mes-pcn包，后续引入类以mes包为主	4 years ago
wynne1005	80b5cca624	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	b1e09f09a3	mes添加stationwebsocket 的busiType类型 强制下线	4 years ago
liangyao	6142d26ee9	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	d176895a5d	北京领料任务提交	4 years ago
陈思洁	9478267dd8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	4cfee2dc9c	【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】	4 years ago
liangyao	46f56540ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
liangyao	e5c7432093	北京领料任务提交	4 years ago
Dominic_Xiao	387131bba1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	95ba4d807b	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	0923584955	Sweb问题修复	5 years ago
Dominic_Xiao	ae9978a3bb	新增serialNumber字段	5 years ago
汪云昊	9556c525d9	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	d2fd06cb2b	fix(core):单号生成规则没有清除缓存	5 years ago
王杰	f9ce9641de	增加索引	5 years ago
joke.wang	da293141cd	oee bug修复	5 years ago
廖普小	4b0c9b927f	Merge branch 'test' of channing.zhang/i3plus-pojo into test	5 years ago
许心洁	de9578d439	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	5 years ago
许心洁	02decfe9c4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	5c1164a938	墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")	5 years ago
小梁不胖	9508bd41ac	北京领料任务提交	5 years ago
小梁不胖	f744b94e87	北京领料报表提交	5 years ago
puxiao.liao	a62b10dc9d	修复合并异常	5 years ago
钮海涛	dfc18cc9b2	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	ffbc5d605e	喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB	5 years ago
钮海涛	6e6a9f7526	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	b5c994a18b	sweb同一供应商编码命名为VendorNo	5 years ago
simon.song	8dcb1703c9	首检返回值字段调整	5 years ago
simon.song	d0e1fcd440	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon.song	56989acba2	12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115	5 years ago
汪云昊	bad1234d0e	Merge remote-tracking branch 'origin/dev' into test	5 years ago
joke.wang	14c47545e7	查询备件库存修改	5 years ago
汪云昊	7348d78238	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	2b522ca15d	工步参数 增加字段	5 years ago
王杰	183111cf65	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
王杰	d64a8fd31c	工步参数 增加字段	5 years ago
陈思洁	7e37a6e22d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	28da49aa29	【12422 19048 增加喷涂抛光条码查询报表 20201112】	5 years ago
王杰	13868d5cd1	producesn 增加索引	5 years ago
王杰	02d002b958	package detail 增加 联合索引	5 years ago
puxiao.liao	c20922a455	Fix bug#12879 ... COGI调账支持出库单模式	5 years ago
simon.song	9b57f47af6	修改pom文件	5 years ago
simon.song	3917408421	Merge remote-tracking branch 'remotes/origin/dev' into test	5 years ago
陈思洁	d8d2dea922	Merge remote-tracking branch 'origin/test' into test	5 years ago
陈思洁	a4093d18d1	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
rock.yu	785152dbfa	接口同步状态赋予默认值	5 years ago
王杰	a94b5dd0b0	看板产线配置	5 years ago
陈思洁	fd166bc0ff	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	47e6a86ecd	【天津bug修改】	5 years ago
Dominic_Xiao	0deb9b4733	中航襄阳滑道工厂需求:新增容器编号字段	5 years ago
王杰	e1783e5e46	pom	5 years ago
joke.wang	d5b2f4a4cd	生产队列增加分组号字段	5 years ago
Dominic_Xiao	86f9faa01d	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
Dominic_Xiao	7b17ecbb29	补全代码	5 years ago
汪云昊	7f2e2189c8	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
汪云昊	7ecbed2cda	fix(order):未固定单号生成长度	5 years ago
puxiao.liao	ca18bb40cd	修复天津单据明细查询对应条码：单据条码增加行号查询条件	5 years ago
许心洁	5e6af26b9f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4a38aab5b6	任务#2989	5 years ago
陈思洁	b0df747d22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	19636e308e	【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】	5 years ago
wynne1005	d9b4a8eb4d	修改包扫描路径	5 years ago
王杰	7be62a939b	TJ看板	5 years ago
joke.wang	970f75f8cf	队列表增加分组号字段	5 years ago
Dominic_Xiao	2a94ce3e0e	包装条码绑定解绑	5 years ago
puxiao.liao	ad0325f7df	修复天津BUG	5 years ago
wynne1005	d893e76ab4	merge	5 years ago
wynne1005	aa450c10e4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
wynne1005	bdf8e0d782	错误pojo修改	5 years ago
Dominic_Xiao	167b0dad0c	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
puxiao.liao	46cc056a43	修复天津BUG	5 years ago
simon	55188db083	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
simon	e0ee86ab73	删除mes-pcn包，后续引入类以mes包为准	5 years ago
钮海涛	af732b7a4f	合并test代码	5 years ago
许心洁	6005e2ab66	Merge remote-tracking branch 'origin/test' into test	5 years ago
许心洁	7aa7738a59	BUG#12600	5 years ago
duan.yang	a38be26538	采购订单表-主表添加同步标识、接口映射方向类型添加 ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
宋双双	b188123ab4	Merge branch 'dev' of i3-IMPP/i3plus-pojo into test	5 years ago
Dominic_Xiao	fd7799b943	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
陈思洁	2e1cc32ffb	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	0bcb009383	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
钮海涛	d9bcdca66a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	eb14a581b9	坤泰生成包装任务	5 years ago
duan.yang	802d5d2320	采购订单表-主表添加同步标识 ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
duan.yang	787629581f	接口映射方向类型添加SWEB2SAP ... Signed-off-by: duan.yang <994300880@qq.com>	5 years ago
许心洁	c1e3b01524	BUG#12504	5 years ago
puxiao.liao	9b70e3c7bf	fifo 推荐过滤条码	5 years ago
joke.wang	2f56f8949e	eol看板优化	5 years ago
Dominic_Xiao	20999fd63a	新增不良品处理查询位置列表	5 years ago
许心洁	6a95335e0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	ee37d6f5eb	任务#12597	5 years ago
陈思洁	95c63fb30b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6ffec48185	【2977 11 2.5.5 整形业务，单件翻包与整箱过站】	5 years ago
王杰	fa3bb1f53a	涂装 看板	5 years ago
钮海涛	8cd41d322a	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	36130d12f2	新增供应商退货业务类型	5 years ago
许心洁	c04895784a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
joke.wang	c679e7f19b	半成品看板优化	5 years ago
许心洁	a604e70771	BUG#12711	5 years ago
许心洁	3ebcfd21e7	BUG#12711,12509	5 years ago
王杰	cf9d3d9f2d	tz 看板	5 years ago
puxiao.liao	21cfe5c740	Fix bug#12004 ... 19058-KT其他出库用例	5 years ago
rock.yu	70f659593b	通用接口增加 cron 表达式的支持	5 years ago
许心洁	be272fd12e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	2d47eeb84d	BUG#12487	5 years ago
钮海涛	12edbb64d5	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	6fe792f75b	posn新增供应商生产批次字段	5 years ago
wynne1005	db87c0c32f	pom版本	5 years ago
钮海涛	3bad341970	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	5cea79571b	PO订单查看按创建时间倒叙排序	5 years ago
许心洁	49fb55bb42	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	66de2c1cbb	任务#2965	5 years ago
joke.wang	f6260cec39	看板产线基础页面	5 years ago
陈思洁	22ec710d78	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
陈思洁	4311fef1a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	be8d655eb9	【12420 19048 喷涂二检增加UNPACK功能 20201112】	5 years ago
王杰	a5935b59eb	Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test	5 years ago
puxiao.liao	a6ca2b35d3	修复北京特殊领料	5 years ago
puxiao.liao	5f73b892ba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	81543e3697	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
puxiao.liao	4392b513f7	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	4757408a3b	任务#2965	5 years ago
王杰	59f916ddab	produceSn	5 years ago
钮海涛	7381ac2ca0	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	bf51e5bb7a	修改登录平台为固定密码	5 years ago
puxiao.liao	d4eef85177	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	0fee0dbe67	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	6c04caf728	【天津看板问题修复】	5 years ago
puxiao.liao	d153205ead	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
simon	5b2bbf7b1e	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	c03446866a	中航-首检单历史记录显示与修改	5 years ago
puxiao.liao	9d7ae4a90f	修复北京特殊领料	5 years ago
钮海涛	b9283ec075	合并dev代码	5 years ago
钮海涛	b57ae573ed	合并test代码	5 years ago
钮海涛	4ec6267b4e	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
钮海涛	89a45d326b	合并test代码	5 years ago
钮海涛	f63813d66d	合并master代码	5 years ago
钮海涛	ceebe541f2	Merge remote-tracking branch 'remotes/origin/master' into test	5 years ago
joke.wang	0009db6b33	工位技能查询bug修复	5 years ago
joke.wang	7a33df666b	JSA JSP表增加索引	5 years ago
joke.wang	148ef03e78	看板产线员工能力矩阵	5 years ago
puxiao.liao	e250883f22	Fix bug#12004 ... 19058-KT其他出库用例	5 years ago
王杰	e2d6b573f0	不良记录报表 报工报表	5 years ago
王杰	3636b75780	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	e21e49ae93	不良处理增加展示字段	5 years ago
simon	0b68fdbee3	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
joke.wang	445f6b309c	备件消耗替代增加查询字段	5 years ago
Dominic_Xiao	8e3943b306	Merge remote-tracking branch 'remotes/origin/test' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java	5 years ago
王杰	c615475dee	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
simon	52974a9633	Merge remote-tracking branch 'origin/test' into test	5 years ago
simon	d3bcf1499e	去掉新增字段非空校验	5 years ago
许心洁	0f5ab7b144	BUG#12609	5 years ago
Dominic_Xiao	183d976c38	新增卡斯马展示组件模型	5 years ago
Dominic_Xiao	27d76d86ae	Merge remote-tracking branch 'origin/test' into test	5 years ago
Dominic_Xiao	a0776b7401	更新卡斯马展示组件,新增展示组件模型	5 years ago
许心洁	79ee6eb901	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	359e085aac	BUG#12430	5 years ago
陈思洁	92b395ad3f	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	88376bb350	【2958 11 2.5.3 热处理上件】	5 years ago
陈思洁	ddc00a617b	【冲突】	5 years ago
陈思洁	2de0d76af3	【2958 11 2.5.3 热处理上件】	5 years ago
许心洁	063ba20f74	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	8e5c2f4b00	BUG#12170,12417,12166,12437,12452	5 years ago
王杰	08fc0b54c6	Merge remote-tracking branch 'i3plus-pojo/test' into test	5 years ago
joke.wang	22411fa928	备件导入增加列	5 years ago
汪云昊	f2180f18f3	revert(pojo):还原pom版本	5 years ago
汪云昊	378205ef61	Merge remote-tracking branch 'origin/dev' into test	5 years ago
汪云昊	cc947c08f5	revert(pojo):还原pom版本	5 years ago
汪云昊	8f899f2f46	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
王杰	b7e2ddd2c2	包装明细 增加索引	5 years ago
simon	faad8cf4c8	修复取消必填字段	5 years ago
汪云昊	fdec58c92a	feat(form):表单导入功能支持	5 years ago
钮海涛	4dd875a691	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	156b515497	修复SWEB问题	5 years ago
joke.wang	1f306924e4	看板自定义参数页面	5 years ago
宋双双	42feb06058	删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'	5 years ago
simon	d8409c5b57	修改文件格式	5 years ago
Dominic_Xiao	22a88a4dc0	卡斯马定时同步实体类	5 years ago
Dominic_Xiao	452024abf6	删除多余类	5 years ago
Dominic_Xiao	13bd15d997	回滚PCN实体类	5 years ago
Dominic_Xiao	d8c52a0534	新增导包	5 years ago
Dominic_Xiao	f551ede492	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
Dominic_Xiao	61638c391a	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	785e8dbfe8	包装详情表新增容器位置字段	5 years ago
Dominic_Xiao	f1fedb53f4	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	eb7ed898df	增加卡斯马业务pojo	5 years ago
Dominic_Xiao	8d0e2b942b	增加卡斯马业务pojo	5 years ago
钮海涛	e9ec997e05	Fix Bug #12413 查询库存条码错误	5 years ago
puxiao.liao	dc3e344f11	Fix bug#12401 ... 19048-发运单支持关联多个470单据号	5 years ago
Dominic_Xiao	e919987d68	Merge remote-tracking branch 'origin/test' into test ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java	5 years ago
simon	7d451dc136	Merge remote-tracking branch 'origin/test' into test	5 years ago
joke.wang	928c643031	看板自定义参数	5 years ago
许心洁	4300201f99	BUG#12430,12495	5 years ago
simon	4c1add6ba4	修改中文描述	5 years ago
许心洁	a5c78ae005	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
许心洁	cbd0b1f136	BUG#12496	5 years ago
王杰	fa01ec478a	Mes_Package 表加索引	5 years ago
许心洁	e59f67e84b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
钮海涛	1842d1de7c	Merge remote-tracking branch 'origin/test' into test	5 years ago
钮海涛	e3e4e1fc84	修复坤泰问题	5 years ago
joke.wang	058bd05b4a	mgn-bj esop展示组件优化	5 years ago
陈思洁	14f9dbed22	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago
陈思洁	c6a3428cbe	【12420 19048 喷涂二检增加UNPACK功能 20201112】 ... 12391 19048-条码补打(包装)增加关联批次查询条件-20201112 开线管控问题	5 years ago
许心洁	ecdc5888a4	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	5 years ago