8660 Commits (73191c19617b643bee82e28fb31dab0b17d1c61d)

Author	SHA1	Message	Date
nies	3bfb61178b	修改MES_QC_CHECK_TYPE	4 years ago
nies	88781e7831	Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test	4 years ago
nies	4850f4ccc2	新增tms的SOFT_TYPE	4 years ago
jun	d0c62b9b2d	16909 19081-生产报废单导入XLS后，单据类型是【隔离报废】，而不是正常的【生产报废单】	4 years ago
puxiao.liao	b44e02cdf6	Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	54732f8fd1	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
puxiao.liao	d1a9fe37cd	修复盘点调差BUG	4 years ago
钮海涛	96c319d848	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	0bd75ba2fe	订单未完全下发最大间隔限制	4 years ago
宋双双	2ae59954d7	Merge pull request 'test' (#282) from honghui.jiang/i3plus-pojo:test into test ... Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/282	4 years ago
jhh2579	54279d43ff	中航工序外协检	4 years ago
jhh2579	9dac40797a	中航工序外协检-2	4 years ago
jhh2579	f4e6c63956	中航工序外协检	4 years ago
castle.zang	563cbab713	bsp 修改pojo	4 years ago
castle.zang	756b41e393	bsp 修改pojo,添加icloud	4 years ago
puxiao.liao	df80f5d2bf	Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev	4 years ago
puxiao.liao	4de836b28a	质检明细状态增加选别	4 years ago
nies	51160a4586	更新用户导入model	4 years ago
钮海涛	1fc8349b66	Merge remote-tracking branch 'origin/ext-dev' into ext-dev	4 years ago
钮海涛	9c9af10973	完成硫化补满模最大间隔限制，订单未完全下发未完成。	4 years ago
nies	0a36e83fd5	更新用户导入的model	4 years ago
钮海涛	3a5fad2a74	完成硫化补满模最大间隔限制，订单未完全下发未完成。	4 years ago
nies	474e181d8c	bsp注册参数增加注册类型	4 years ago
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