8787 Commits (10967abd1b33701beb58ec1ba8f3ae4d93be2bfb)

Author	SHA1	Message	Date
gsz	6411160219	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
gsz	4b21ff8851	南非E看板提交 修改	4 years ago
钮海涛	d0b880c7aa	牵纱拆余数到手工设备完成最大间隔限制，硫化补满模未完成。	4 years ago
puxiao.liao	24a0f1026f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
nies	5da810fb20	Merge branch 'test' into dev	4 years ago
nies	9a534c96e6	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
nies	0aa24fb812	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	1e0f9a847a	新增人员导入的model类	4 years ago
钮海涛	f0147d2680	按订单排程，完成最大间隔限制，牵纱拆余数到手工设备未完成。	4 years ago
曾贞一	634dce48b9	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
曾贞一	90f0936b20	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	add0708fb2	【3617 收货入库-后端开发】	4 years ago
castle.zang	aa3ece8336	增加脚本支持，修改返回为resultBean	4 years ago
钮海涛	5b41f25711	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	13d015e79a	工序间最大间隔限制调整前	4 years ago
jun	7945213f6e	19048 -- 供应商退货选择ERP单号界面增加【已退数量】字段 --20210710	4 years ago
jun	d5fd0ec33a	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	1de5989099	华域麦格纳组托	4 years ago
jun	e5e79230db	WmsStockSn新增箱重量和托重量	4 years ago
puxiao.liao	1ff31386af	规则加载加入路径配置	4 years ago
puxiao.liao	1a403dfefd	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	efbb51711e	16826 19081-备件计划导入功能增加数量选项，便于快速导入-20210723	4 years ago
gsz	c901b36663	Merge remote-tracking branch 'remotes/origin/test' into ext-dev	4 years ago
Wynne	55af273ea7	feat(Screen): 界面回显 ... 界面回显	4 years ago
曾贞一	bb48086df9	Merge remote-tracking branch 'origin/test' into test	4 years ago
曾贞一	4cd0f48f52	【查询条件】	4 years ago
jun	fdec525fa1	16788 19081-北京麦格纳，ERP明细报表优化，2021-07-16	4 years ago
puxiao.liao	ad1f48c28c	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
jun	8e9cc32c9a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
jun	c93d9bdd2a	北京麦格纳ASN看板明细新增字段后无数据	4 years ago
castle.zang	52b70927b3	ptl亮灯增加backoff字段	4 years ago
puxiao.liao	93cfa0ec44	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	521e12b69c	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9910420ea8	完成最大间隔限制问题。	4 years ago
puxiao.liao	e4b7159fc7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	804401e12c	修复枚举导出异常	4 years ago
puxiao.liao	4250f215f2	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	09e380d1f2	属性添加枚举值注解	4 years ago
joke.wang	f0c0a4038c	ua配置	4 years ago
joke.wang	a086d24203	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	d2ec6e27a5	条码注释掉版本字段	4 years ago
puxiao.liao	e48341f47b	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
wynne1005	d8ad92fe24	merge test 还原pom	4 years ago
wynne1005	08a0ca7937	merge dev 还原pom	4 years ago
wynne1005	8cb6abc09d	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
Dominic_Xiao	4297c59ef4	去除无效索引	4 years ago
Dominic_Xiao	5c62f1b0d5	产线班次时段新增顺序字段	4 years ago
Dominic_Xiao	adfec8957d	看板班次时段增加序号	4 years ago
puxiao.liao	48fb24f3d7	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	2521606f5b	删掉无效索引	4 years ago
puxiao.liao	606653ec0c	条码表增加工单，班次字段信息	4 years ago
puxiao.liao	ac535feab8	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	370f4e9a02	强过报工定时任务	4 years ago
gsz	c8cdc48290	WmsECartOrderNoBuild	4 years ago
gsz	d0d34f9a8f	WmsECartOrderNoBuild	4 years ago
gsz	c4057a64ad	WmsECartOrderNoBuildRepository	4 years ago
puxiao.liao	59677dc00a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	3136ba43b1	明细增加供应商信息	4 years ago
wynne1005	c55875e129	feat(screen): 7.7 通用界面与前端完成回显 ... 7.7 通用界面与前端完成回显	4 years ago
gsz	e029090e03	南非领料单据命名规则更改  零件号*yyMMddsequenceNo --20210707	4 years ago
Dominic_Xiao	b54b31779b	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	c3a018dc1f	零件消耗数量模型	4 years ago
nies	c467fff481	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	8791ead24a	修改bsp平台执行器的注册参数	4 years ago
曾贞一	edd25a1fe3	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
gsz	2b5da37bbe	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
gsz	c75973e674	南非领料单据命名规则更改 零件号*yyMMddsequenceNo	4 years ago
gsz	f5dee63b21	3579 20063-精冲预警看板-202107	4 years ago
puxiao.liao	ded6612504	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
nies	cb740da130	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	f9eac5d6af	更新AccountExportModel	4 years ago
jun	6ba94fab3b	WmsMoveSn 删除无效多余索引映射	4 years ago
jun	5ca70c8ae6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
jun	3ac0d2d6dc	删除wmsStockSn无效索引映射	4 years ago
曾贞一	95cee813c0	【jenkins打包报错】	4 years ago
jun	79608e26e7	北京mgn ERP FG details明细报表	4 years ago
曾贞一	5efca780b1	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	983f5db7cb	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	ec3bcc7518	有库存问题修复	4 years ago
曾贞一	df1a5716fb	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	6049d5d041	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	94a6f616e7	BOM添加采购类型字段	4 years ago
puxiao.liao	b3c2e6a728	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	1e13a34883	BOM添加采购类型字段	4 years ago
duan.yang	0e3138c85d	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
duan.yang	48779edcfc	添加同步至WMS标识 ... Signed-off-by: duan.yang <994300880@qq.com>	4 years ago
puxiao.liao	4840627a7f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	e711e9f051	Excel的导出增加批注信息	4 years ago
钮海涛	ebe47b102a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	b0d2a7b710	有库存问题修复	4 years ago
Dominic_Xiao	383576d0c8	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	980f98bf26	安灯看板模型新增具体事件原因字段	4 years ago
王杰	a1fcd53e1f	Merge branch 'test' into ext-dev	4 years ago
王杰	c22117f395	Merge branch 'test' into dev	4 years ago
nies	0b81a19bdc	Merge branch 'test' into dev	4 years ago
nies	3bc5bdca14	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	9879d6a7b9	新增账户导出的model	4 years ago
gsz	c39af17bcc	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
gsz	c557d715e4	3578 20063-供应商到货窗口时间看板-202106 ... 16556 20063-接口状态监控报表-明细数据只查询未同步数据	4 years ago
王杰	257bd43a8f	对象结构增加plc代码	4 years ago
puxiao.liao	4d8240c78c	文件取消文件名称唯一约束	4 years ago
puxiao.liao	11296ad9f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	cfcb4bda03	设备故障现象增加上传图片	4 years ago
puxiao.liao	70ec23db12	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	72a2a24cf7	用户信息优化	4 years ago
puxiao.liao	9a952c4f3d	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	c8b994a596	作业任务查询新增设备代码	4 years ago
puxiao.liao	c842d3e5e5	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	39bc94ceda	成品检验报工	4 years ago
nies	ead7522125	方法注册新增参数	4 years ago
castle.zang	c3f473456b	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java	4 years ago
castle.zang	6eff18d60b	松下用户角色更新记录表，字段长度过长报错,修改类型	4 years ago
gsz	4e71476f2c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
gsz	e027736364	16409 20063-PDA创建领料任务-优化校验子零件和替代料维护关系	4 years ago
nies	0cda9012f2	Merge branch 'test' into dev	4 years ago
nies	7755034dc8	修改SyslogRoleChange currentRoles 字段为TEXT类型	4 years ago
Dominic_Xiao	e415b4599d	安灯报表新增基础字段	4 years ago
Dominic_Xiao	cee28a81bc	安灯新增班休表	4 years ago
Dominic_Xiao	13b8852e40	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	37b352ce0b	安灯新增班休表	4 years ago
joke.wang	d325e01e0f	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
joke.wang	7c67e954c7	设备任务上传文件	4 years ago
Dominic_Xiao	9c94d857d7	泰国电检条码打印	4 years ago
Dominic_Xiao	9e0c16eadf	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	21c9a4ae01	新增安灯目标表	4 years ago
joke.wang	52f4ea0331	设备任务上传文件	4 years ago
Dominic_Xiao	f2274243a6	安灯新增目标表	4 years ago
Dominic_Xiao	01bf4f2542	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	5755f86ca5	安灯新增目标表	4 years ago
joke.wang	fd32eb6bf8	工装使用次数预警job	4 years ago
joke.wang	d96f4b5d74	16496 19081-设备管理调整-	4 years ago
钮海涛	65a2e93dae	修复动态拆分输入，输出数量更新出错	4 years ago
wynne1005	bb88851f17	还原pom	4 years ago
wynne1005	0e21856803	Merge branch 'dev' into test	4 years ago
wynne1005	85b922d492	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	42fb211a26	625 数据对象更新	4 years ago
puxiao.liao	7e8b0fdb42	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	ed7b2fdbfe	bug修复	4 years ago
joke.wang	3c42131f2b	16436 19081-PCN-返工返修-隔离-基于条码查询零件时-散件清单和物料bom，和增加物料名称查询条件	4 years ago
钮海涛	76af5bc47d	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	7109cc8acb	生产计划下发到MES	4 years ago
陈思洁	e3a558913b	【3566 20063-鉴定报工-20210618】	4 years ago
陈思洁	28474c8aba	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
王杰	fc8619208a	pom	4 years ago
王杰	1f1acc05a3	Merge branch 'test' into ext-dev	4 years ago
王杰	a71774ba24	pom	4 years ago
王杰	3e63b97bc3	Merge branch 'test' into dev	4 years ago
王杰	c14eb6e0bb	pcn	4 years ago
王杰	21ca70f863	pom	4 years ago
王杰	c6bc2e682a	Merge branch 'test' into dev	4 years ago
jun	bda7b30475	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	21247058a8	bsp client 新增model	4 years ago
castle.zang	f93e282d11	bsp server pojo	4 years ago
puxiao.liao	0a148e4035	增加质检枚举信息	4 years ago
Dominic_Xiao	7a92162ca6	卡斯马锁定记录表增加工位名称字段	4 years ago
puxiao.liao	339538fa71	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	30b5d431c1	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	c43eba89f3	新增三力士换模时间计算	4 years ago
wynne1005	d6b2bce9b0	fix(screen): 6.21 枚举调整 增删改查测试 ... 6.21 枚举调整 增删改查测试	4 years ago
puxiao.liao	17151a9b79	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	a63ce49a89	修改单据明细查询	4 years ago
joke.wang	e0e1231e09	16381 19081-andon事件处理-增加字段	4 years ago
wynne1005	5e6a2d8839	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	3544aa076e	天津it审核需求	4 years ago
王杰	005d3ef8f9	物料	4 years ago
Dominic_Xiao	5a354229f7	泰国电检	4 years ago
Dominic_Xiao	66c627a698	新增泰国扭矩产线专用条码生成规则	4 years ago
陈思洁	9ea5b11f20	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	02cf004828	【3566 20063-鉴定报工-20210618】	4 years ago
puxiao.liao	a4bc97c5da	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	1b01f74f42	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	33b4b60c38	报废率趋势优化	4 years ago
joke.wang	8b5447f5ca	停机统计报表	4 years ago
castle.zang	5756e5ccd9	合并代码	4 years ago
castle.zang	265dcdbcb1	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into remoteDev	4 years ago
castle.zang	cbef156ac2	方法调用工具类	4 years ago
castle.zang	f9332cd514	方法调用工具类	4 years ago
nies	69821a54aa	删除 .bak文件	4 years ago
nies	46daa2c1cd	bsp 新增client端model	4 years ago
Dominic_Xiao	6947405f44	16328 20135--锁定记录增加零件码这个字段--2021-06-23	4 years ago
陈思洁	9c4b0b44f1	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	0170a86f60	【3484 20063-待处理报工基础数据-20210610】	4 years ago
nies	b545d4928a	SYSMENU 新增字段	4 years ago
jun	0a8ad27fbb	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
castle.zang	6c79b95bf2	refactor modules name	4 years ago
castle.zang	c34e72f7aa	表名和列名修改为大写字母	4 years ago
castle.zang	9b2e0e8508	bsp-server bean 和 repository	4 years ago
宋双双	bef8415707	更新 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java' ... 泰国需求：接口表增加PACKAGE_NO字段索引	4 years ago
陈思洁	5cda292bc2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	29d62c4334	【3484 20063-待处理报工基础数据-20210610】	4 years ago
Dominic_Xiao	35e41f94e1	卡斯马锁定记录表锁定状态赋默认值	4 years ago
Dominic_Xiao	dbdcbec032	产品工序过程报表新增料架号字段	4 years ago
Dominic_Xiao	e82043a798	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	aa78fd8bd5	卡斯马异常锁定	4 years ago
puxiao.liao	9333bfc996	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	fe3416a736	查询条件的新增	4 years ago
Dominic_Xiao	27ceea4113	16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18	4 years ago
钮海涛	7150f1c51f	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	eeb9ab500b	排程结果优化	4 years ago
puxiao.liao	93906742a6	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
陈思洁	ee42edc94c	【3484 20063-待处理报工基础数据-20210610】	4 years ago
puxiao.liao	66fb8e5894	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	9cfcb2a59d	查询条件的增加&PO增加库存地字段	4 years ago
wynne1005	321209f2b4	Merge branch 'test' into ext-dev	4 years ago
wynne1005	e7df36d3e9	还原merge pom	4 years ago
wynne1005	69d872be7e	Merge branch 'dev' into test	4 years ago
wynne1005	7aa3d4bddf	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
wynne1005	2b0a7198a5	fix(impp-framework core block): 统一提交 ... 还原pom 添加界面 icloud 升级mysql 驱动版本 添加松下日志切面	4 years ago
puxiao.liao	2acc57e72d	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
joke.wang	470b05ebf0	北京ptl亮灯	4 years ago
rock.yu	38126d9812	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/bean/WmsLocate.java	4 years ago
rock.yu	40fc186ed6	BOM, Locate POJO 增加索引	4 years ago
王杰	a321a28759	Merge branch 'test' into ext-dev	4 years ago
Dominic_Xiao	5bf2121c92	Merge remote-tracking branch 'origin/test' into test	4 years ago
Dominic_Xiao	778df56d2e	16217 20135--增加料架需要跟生产线绑定关系--2021-06-08 ... 16162 20135--自动操作增加工号扫码（在每一个工位第一步扫码工号，每操作一次需要扫描一次工号）--2021-06-28 16152 20135--异常锁定，解锁和解锁记录--2021-06-25	4 years ago
王杰	4fe445e4c3	test merge dev	4 years ago
陈思洁	ce8a66d83a	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	4d5cdc710e	【16023 19081-部分工位安灯呼叫没有反应、呼叫成功无法取消和处理-20210525】	4 years ago
puxiao.liao	582f4ba81a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	7125556090	盘点查询增加状态查询	4 years ago
曾贞一	561717b7a3	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
曾贞一	8b4bd8d8ab	【中航-优化委外发运业务】	4 years ago
puxiao.liao	4d5888ae36	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	1835890e4c	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	d952e7a8e9	采购收货进度报表增加列查询，窗口开始时间，窗口结束时间	4 years ago
puxiao.liao	2f903e07fa	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	224e3a9a51	字段和枚举的新增	4 years ago
puxiao.liao	de75b43008	增加质检枚举信息	4 years ago
puxiao.liao	590c433b89	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Dominic_Xiao	c67f263e5d	卡斯马不良品处理格式化代码	4 years ago
joke.wang	cda0f670eb	16198 19081-工位工时统计	4 years ago
joke.wang	110cc85b6e	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
wynne1005	261d5b3655	Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev	4 years ago
puxiao.liao	a8b163261d	mysql 版本修改	4 years ago
puxiao.liao	46085f9051	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
钮海涛	81bbe8476a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	6e6b0a7c11	排程结果优化	4 years ago
puxiao.liao	b31342c5db	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Xiao-yin0517	e7f5397e59	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
Xiao-yin0517	b9bae06c0c	更改实体字段，添加实体	4 years ago
puxiao.liao	2580841944	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	808f60a64a	代码优化	4 years ago
wynne1005	2f1b184e9f	fix(impp): 格式化 ... 格式化	4 years ago
joke.wang	a271672ff5	产品追溯报表优化	4 years ago
puxiao.liao	0d73e0797e	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	ba00df95f2	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
puxiao.liao	d71434851c	增加库位名称	4 years ago
潘天虎	5d05083665	Merge pull request 'ext-dev' (#276) from andly.pan/i3plus-pojo:ext-dev into ext-dev ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/276	4 years ago
andly.pan	8b9883d2f7	增加邮件和字段属性	4 years ago
wynne1005	4f74fdaa3d	密码过期策略加入安全策略	4 years ago
puxiao.liao	e0083530f0	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	96ea96f0a2	模板明细增加是否导出模板excel 头	4 years ago
puxiao.liao	c42a4b250d	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Xiao-yin0517	a47b8d1785	syncDataId改为string类型	4 years ago
joke.wang	5eae801feb	16073 19081-看板管理-产量看板-产量看板调整	4 years ago
曾贞一	00a12b8a1c	【15902 19125+ASN业务收货条码，收货完成后。在打印中心-条码打印状态标记为已打印+0519】	4 years ago
Xiao-yin0517	d74e2f053d	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java	4 years ago
潘天虎	1cc6fcaa9a	Merge pull request 'ext-dev' (#275) from andly.pan/i3plus-pojo:ext-dev into ext-dev ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/275	4 years ago
andly.pan	44bbc798c1	Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev	4 years ago
andly.pan	dfa897720e	Mdm增加repo	4 years ago
andly.pan	e66c99e509	Mdm修改	4 years ago
puxiao.liao	52bb4fe82f	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
Xiao-yin0517	0f406c54b8	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java	4 years ago
Xiao-yin0517	c4b82c4891	更改通过同步数据	4 years ago
潘天虎	8366905f58	Merge pull request 'ext-dev' (#274) from andly.pan/i3plus-pojo:ext-dev into ext-dev ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/274	4 years ago
andly.pan	8abe9cb030	新增动态配置	4 years ago
钮海涛	c4660251cd	优化资源评估中间计算结果。	4 years ago
andly.pan	19767dfcc9	Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev	4 years ago
andly.pan	f2cca59ee5	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev	4 years ago
andly.pan	46debfb7fb	Mdm增加字段	4 years ago
andly.pan	4890eb87a3	Mdm增加字段配置	4 years ago
simon.song	aa3d3ff674	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	dd7657d7e1	数据迁移功能优化	4 years ago
钮海涛	3d66e54cea	优化资源评估中间计算结果。	4 years ago
陈思洁	3fa05bc816	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
陈思洁	1f84c2f8aa	【15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22】	4 years ago
钮海涛	463f910b7a	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	3a3bdc664a	修复工作左边界计算问题	4 years ago
simon.song	e4c94df17c	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	83e33e2403	代码还原	4 years ago
Xiao-yin0517	2d2faaaa4c	更改实体类	4 years ago
andly.pan	3dca058857	Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev	4 years ago
andly.pan	0453e33e8f	和外部系统同步数据	4 years ago
王杰	c7a62d52b5	Merge branch 'test' into ext-dev	4 years ago
王杰	a0f4fef78d	Merge branch 'dev' into test	4 years ago
王杰	bddf876ee3	工位展示组件 增加 doFunction 方法	4 years ago
李俊生	804f9240cc	零星出库单需要增加出库原因、部门、领用人（前3个调用枚举）、项目号（调用项目信息） ... 零星入库单 增加入库原因	4 years ago
simon.song	e8fdaa58be	15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22 simon.song 2021/5/24 下午6:14	4 years ago
simon.song	17a61b2c2b	15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429	4 years ago
simon.song	792d4263c5	接口表增加同步标识，kettle同步工具使用	4 years ago
simon.song	95029f6abd	Merge remote-tracking branch 'origin/test' into test	4 years ago
simon.song	32e4bb4ba7	15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22	4 years ago
王杰	4fdab21958	Merge branch 'test' into ext-dev	4 years ago
王杰	15dc951bf1	dev merge test	4 years ago
王杰	56ed9e73f2	ctno 增加 同步标志 松下wms接口映射需要此字段	4 years ago
王杰	5d33795cff	test merge dev	4 years ago
王杰	ab1bc23eb7	Merge branch 'test' into dev	4 years ago
王杰	ae71f6a008	状态机 - 增加逻辑	4 years ago
Dominic_Xiao	40d7dbff22	15957 20027-PCN端-来料检验&发货检验-影藏过程条码列&判定结果要展示出来-20210521	4 years ago
Xiao-yin0517	6f1b047725	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
Xiao-yin0517	1696ba05e3	更改实体类	4 years ago
andly.pan	95d72cf4af	库存交易条码新增字段（同步仪征） ... Signed-off-by: andly.pan <andly.pan@estsh.com>	4 years ago
Dominic_Xiao	524a766dd5	中航SPC表新增零件号字段	4 years ago
wynne1005	95ac5f0ee3	feat(screen): jdbc拼接初步完成 待整理代码 ... jdbc拼接初步完成 待整理代码	4 years ago
puxiao.liao	c05cb37dff	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
castle.zang	8ef28595ab	bug 动态表单工厂隔离:增加组织隔离属性ID	4 years ago
puxiao.liao	a001dae575	代码回滚	4 years ago
puxiao.liao	eb8f03cf19	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-andon/pom.xml modules/i3plus-pojo-aps/pom.xml modules/i3plus-pojo-jobflow/pom.xml	4 years ago
李俊生	5f52b1aa33	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
李俊生	206b522af5	pom冲突	4 years ago
李俊生	adb48ef07f	南非收货提交后，需送检的零件后需要有送检的提示	4 years ago
曾贞一	54329c67ec	【同步BH成品条码JOB-优化】	4 years ago
castle.zang	4fa41f2f90	还原pom version	4 years ago
castle.zang	9a4d2060b6	修复version版本号	4 years ago
曾贞一	93c64328db	【修改-pom.xml】	4 years ago
臧学普	7aa68616bc	Merge branch 'master' into test	4 years ago
肖奕扬	62505fa7b7	Merge pull request '一次性通过率BUG修改' (#268) from xiangming.liao/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/268	4 years ago
钮海涛	7c60ce4cdc	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	b5bbf7aefb	增加等待时间评估规则	4 years ago
puxiao.liao	48d2f6680a	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
李俊生	85dd71b1ca	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test ... Conflicts: modules/i3plus-pojo-screen/pom.xml	4 years ago
wynne1005	83b4cb64df	merge dev	4 years ago
钮海涛	f50d358cdd	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	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