1435 Commits (7e0ac2e0866f96696af788cf5b39acfc70214c7a)

Author	SHA1	Message	Date
王杰	d94723f1d3	排序 匹配装配件工步	8 months ago
王杰	05038cf65c	排序 匹配装配件工步	8 months ago
yxw	b1905b75e3	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	70d83d76c7	打印队列表	8 months ago
jun	63493c7fd9	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	9ceb874f19	通用包装组零件校验(VKM)功能开发	8 months ago
yxw	89e087632e	电子化检验弹框数据处理	8 months ago
yxw	bbf6577607	电子化检验弹框数据处理	8 months ago
yxw	3acc35c0ab	电子化检验弹框数据处理	8 months ago
yxw	db81a86fe7	电子化检验弹框数据处理	8 months ago
yxw	764744cba5	电子化检验弹框数据处理	8 months ago
王杰	2dcadee21b	工步弹框	8 months ago
王杰	1988ac9e83	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
王杰	e22a91f580	排序 匹配工步	8 months ago
yxw	de08e40843	裁片工单打印	8 months ago
王杰	8e81257831	排序 匹配装配件工步	8 months ago
yxw	ca1aa4a652	裁片工单打印优化	8 months ago
gsz	8290261d5b	JIS物料拉动PCN页面2	8 months ago
yxw	188741a4dd	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	04e7942d04	裁片原材料防错优化	8 months ago
王杰	ba1a743d20	Merge branch 'master' into dev-wuhan-temp	8 months ago
gsz	0113527434	JIS物料拉动PCN页面2	8 months ago
王杰	bbd0f74b5c	Merge branch 'dev'	8 months ago
yxw	b578de2b1a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	82a6beef27	MesPcnExtConstWords VERTICAL_BAR 参数名更改	8 months ago
王杰	a149c7cb55	Merge branch 'dev' into dev-wuhan	8 months ago
yxw	0957d7c212	PCN裁片工单打印	8 months ago
yxw	3c60fd4487	PCN裁片工单打印	8 months ago
yxw	a78238b49c	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	e476c0c4dc	裁片相关pojo修改	8 months ago
王杰	08aa3def34	打印非报废条码工步	8 months ago
gsz	c8895560b5	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
gsz	932f06d023	JIS物料拉动PCN页面1	8 months ago
yxw	0e5b02c65d	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	739136d035	查询bom增加生效开始时间分组	8 months ago
yxw	550fcee7aa	裁片功能优化	8 months ago
王杰	8f3dd7bc9b	排序 显示前道所有装配件扫描项	8 months ago
yxw	e9d2615935	裁片功能优化	8 months ago
yxw	ab9f3dde09	裁片功能优化	8 months ago
yxw	e783d75ae2	裁片功能优化	8 months ago
xiangwei.zhang	213e349773	新增bomCode	8 months ago
jun	d2d1d98281	43072 加料防错 料箱自动初始化	8 months ago
jun	2322cc606c	43063 PDA点检重复扫描了同一个条码，希望提示清晰	8 months ago
yxw	ab3fd934cf	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	312a57c4be	裁片工单标签打印接口开发	8 months ago
jun	ca7e6bb915	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	f4ebfa030e	包装解绑功能开发	8 months ago
yxw	e798943bfe	裁片工单标签打印工步修改	8 months ago
yxw	cab28f1ba8	裁片箱标签打印参数增加时间	8 months ago
yxw	8a0ccc46f9	裁片箱条码打印工步增加修改裁片工单状态为已打印逻辑	8 months ago
yxw	6e90772d0f	裁片箱条码打印	8 months ago
yxw	babf855266	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	8 months ago
yxw	a6a399205d	裁片箱条码打印	8 months ago
yxw	226ee0be3f	裁片方案、工单增加属性	8 months ago
jun	b387f9c11e	增加常量3定义	8 months ago
jun	c454fa84a3	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	8 months ago
jun	e931661d01	包装解绑功能开发	8 months ago
yxw	c658a8a5b8	裁片打印策略类	8 months ago
yxw	5ea796fb79	裁片打印工步	8 months ago
王杰	d83d750632	排序装配件确认方式：通用自制件补条码字符	8 months ago
王杰	984a761881	前道防错， 顺序防错 逻辑调整	8 months ago
王杰	da07938e34	扫描主条码 工步 剔除排序场景	8 months ago
王杰	ac408df8b5	排序 设备加工参数工步	8 months ago
王杰	c5d1382724	生产线增加字段 是否忽略 工单质量状态	8 months ago
王杰	d51bcd2278	排序 显示装配件扫描项	8 months ago
王杰	f1f1d8fcdf	前道防错	8 months ago
王杰	ebc7bcd0b4	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
王杰	377e8aa2e9	工步弹框	8 months ago
yxw	63cd8c2671	裁片功能	8 months ago
yxw	641c881f94	裁片功能-》弹框展示成品列表Function	8 months ago
xiangwei.zhang	55984cee69	判断可疑	8 months ago
yxw	70de9c9b15	裁片功能-》弹框展示成品列表Function	8 months ago
yxw	b99fded8f5	裁片功能-》弹框展示成品列表Function	8 months ago
yxw	4b6d081ede	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	f105f37d7f	裁片功能-》弹框展示成品列表Function	8 months ago
王杰	89c1240140	合并dev	8 months ago
王杰	49549429cb	漏信号 优化	8 months ago
gsz	b36912724c	SPS物料拉动PCN扫描页面2	8 months ago
gsz	bb2a3f1092	43010 PNC增加装配件查询	8 months ago
jun	2f3b3b0761	number同时存在大于小于某个字段问题修复	8 months ago
jun	aae08f45b1	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	33cbf3d537	等离子功能开发	8 months ago
gsz	430d3556da	把拉动单打印产线 拉动组多选	8 months ago
gsz	03bf31ef50	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
gsz	bc7d209620	SPS物料拉动PCN扫描页面1	8 months ago
jun	96f6e5cdd6	返工拆解逻辑调整	8 months ago
jun	023203efaf	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	8680ee4e9b	原箱进原箱出逻辑开发	8 months ago
王杰	2314130e5a	上下文 物料	8 months ago
王杰	5e1f6de520	工步弹框	8 months ago
王杰	2af9d8f125	工步弹框	8 months ago
jun	59c44cb199	发运单，装车单跳过逻辑调整	8 months ago
jun	17a2254f3a	站点信息基础数据	8 months ago
jun	e22af55524	装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS	8 months ago
jun	bf49601ad1	扫描可回用包装开发	8 months ago
yxw	47dee04a69	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	ae725102b7	保存裁片加工记录	8 months ago
jun	d883d077fd	料包绑定增加外协件逻辑	8 months ago
王杰	59fc125885	通用顺序防错工步	8 months ago
jun	0cd56db811	返工代码优化	8 months ago
jun	91ff86f2d3	返工完成方法名事务问题修改	8 months ago
yxw	428e0bdce6	修改原材料长度	8 months ago
jun	a63247efc8	返工拆解inspection表里，nc_status增加拆解功能	8 months ago
jun	8a08eaaf53	发运单中默认不写装车单信息，需要反查	8 months ago
jun	fd46d3ab15	发运跳过逻辑优化	8 months ago
yxw	54bc6daf7f	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	add6da8105	修复原材料防错记录修改长度履历时修改类型不对问题	8 months ago
王杰	1cfe0f53c0	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	959eb9aa11	设备计数验证shotCounter	8 months ago
yxw	b3c75bb50a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	1e8f6672cf	裁片功能	8 months ago
jun	05d89d34bb	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
jun	2ef4f1e2f0	料包绑定功能开发	8 months ago
yxw	df3f552348	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	f6e0ae2118	裁片原材料防错增加长度修改记录	8 months ago
王杰	5cf100bce8	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	8 months ago
王杰	c2b94c2ad6	生成零件号 可复用	8 months ago
王杰	b2325f6ce0	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	8 months ago
王杰	8d704d6a9e	排序顺序防错	8 months ago
yxw	65b902f4ba	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	82db0d1594	10.193.30.22 服务器配置文件	8 months ago
jun	b98c50a6e8	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	408911ff1b	返工拆解，查询树形装配件，增加id,pid关联	8 months ago
王杰	3cf7ef6096	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	8789532066	PcnRepositoryAspect	8 months ago
jun	d76ad89328	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	3a5e4d844e	重新检测生成单据，同步标识重置	8 months ago
gsz	58811fff06	42984 初检创建时修改人和修改时间不能赋值	8 months ago
yxw	78514c8beb	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
yxw	2a6bcfc4dc	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	487c627bf8	裁片工单生成问题修复	8 months ago
jun	adfcb960c9	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	a4a612bd9c	点检单同步标识未修改	8 months ago
王杰	f894210e6f	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	0c88633bfa	删除无用的备份工步	8 months ago
王杰	90e6ff708d	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	8 months ago
王杰	ba80057ac8	读设备数据 写日志 增加	8 months ago
jun	05ccf6501f	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
jun	b731d10d44	电子化检验拆解功能开发	8 months ago
yxw	bcf15b1eaa	修改原材料修改记录表	8 months ago
yxw	d5d51e0585	Merge remote-tracking branch 'origin/dev' into dev-wuhan	8 months ago
王杰	fae918112f	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	f06716eec8	生产零件号 可复用 报错 问题修复	8 months ago
王杰	a2c80f138d	代码写错	8 months ago
王杰	f9a1e5322e	Merge branch 'dev' into dev-wuhan	8 months ago
王杰	27b40d6709	设备查询点位数据去除事务	8 months ago
jun	bc60e1a2c1	电子化检验拆解功能开发	8 months ago
yxw	9f6afe14fd	解决代码冲突	8 months ago
yxw	92f9a79e97	PCN长度修改类型获取接口	8 months ago
yxw	abc8599d73	Merge remote-tracking branch 'origin/dev' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java	8 months ago
yxw	9841ac7cde	Merge remote-tracking branch 'origin/dev' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java	8 months ago
jun	5a6b1f1d2a	Merge remote-tracking branch 'origin/dev' into dev	8 months ago
yxw	9b018ceb28	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	8 months ago
yxw	a8db4e761c	裁片原材料防错	8 months ago
yxw	6537f792ef	裁片原材料防错	8 months ago
jun	43ba2569c1	非排序拆解功能	8 months ago
王杰	a5dd6cf0f3	常量 睡眠2s改500ms	8 months ago
王杰	8e321c50ff	wuhan 工单 工步	8 months ago
xiangwei.zhang	25b01eb43c	判断可疑	9 months ago
xiangwei.zhang	17cc0df013	判断可疑	9 months ago
gsz	1ae2f9a3f2	42925 原材料防错优化	9 months ago
yxw	38c4fa0907	裁片功能主数据表	9 months ago
gsz	7fd1e0aa7a	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	9 months ago
gsz	6179c4b4b1	电子化检验 质量状态发生变化后，同步标识改为未同步	9 months ago
jun	2d7e14e916	原材料防错，提交逻辑优化(代码回退)	9 months ago
jun	463a365660	非排序 返工拆解流程开发	9 months ago
jun	e8395e2062	非排序 返工拆解流程开发	9 months ago
jun	8dc523d83d	PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号）	9 months ago
jun	9b7c9e4bb2	原材料防错，提交逻辑优化	9 months ago
jun	c927a4f9e0	发运单中装车单字段赋值	9 months ago
jun	3d7358c134	设备点检，点检类型：设备点检、工艺参数点检，点击开始点检后，需要强制扫描/输入设备ID	9 months ago
jun	045414d98d	点检功能，工艺参数点检，目前无法完整使用该功能。	9 months ago
王杰	c71f0e983a	工序用量, 不显示且不扫描, 规则且唯一单独表记录	9 months ago
jun	4e61e55de5	汇总工单发送SAP逻辑调整	9 months ago
王杰	48d268e2e1	发送设备加工参数, 物料取值变更	9 months ago
王杰	cb2f68baf8	扫描装配件工步 魔鬼数字 改枚举	9 months ago
gsz	5245e00ca9	工位参数按钮事件接口实现【设备停机】FUNCTION_EQU_DOWNTIME	9 months ago
王杰	5f6a79b122	71 239 配置文件	9 months ago
王杰	9d91db16b3	工步操作redis 方法去动词； 读加工结果 增加shot	9 months ago
jun	96924514fb	装配件替换，提示信息优化	9 months ago
jun	603123568f	返工，装配件替换问题修复	9 months ago
gsz	53b5928add	报工job修改	9 months ago
jun	59f9023c23	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	8361a745e6	42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 ... 42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描	9 months ago
gsz	d2ef4c8a4a	newMesProductOffLine赋值修改SapWorkCenter--祥卫	9 months ago
jun	697d0933ae	PDA产品加工记录查询，查询速度优化	9 months ago
jun	5dc8837436	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	dac6b80993	生产版本和工作中心绑定关系取消	9 months ago
王杰	9147f38645	读设备工步 优化提示	9 months ago
王杰	c37cd5ee60	新增场景：扫主 扫装 生成零件号	9 months ago
王杰	95827228de	扫描装配件2 生成零件号2 新增场景:扫主存在多个加工规则场景的解决方案	9 months ago
jun	fa3772b9d0	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	5cb72f5c38	接口映射，自定义脚本页面开发	9 months ago
gsz	95b689b2a1	创建的工单号写到设备加工记录表--唐08-22变更	9 months ago
jun	573d95cbd6	返工打印新条码记录	9 months ago
jun	1ebecd579f	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	3399bd2d9a	42660 SAP生计划完成率更新	9 months ago
xiangwei.zhang	6b0e3bca88	判断可疑	9 months ago
jun	2657180fea	NC处理，单件条码转正常不校验条码是否存在	9 months ago
jun	3d06845ba9	外部解析条码长度卡控	9 months ago
jun	f0f4c667e4	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	3f4af68ed3	42602 发运后，客退品返工，生成并打印新条码 ... 42582 线边库存报表	9 months ago
王杰	63cf4c1a3b	忽略修改	9 months ago
xiangwei.zhang	845691f465	判断可疑	9 months ago
王杰	cdaa0c7b20	增加日志	9 months ago
王杰	879b6d2f93	设备加工参数 查询点位数据判空	9 months ago
jun	746eed96ce	零件条码状态，产品加工记录报表开发	9 months ago
微笑着面对明天	3715f5b4aa	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
微笑着面对明天	b1adbaad49	报工忽略试制单	9 months ago
jun	444e6ac070	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
微笑着面对明天	fb3397410f	报工忽略试制单	9 months ago
jun	a508a8bff6	更新同步表示	9 months ago
王杰	a55002ae0c	设备加工参数 工步 替换	9 months ago
王杰	bfc210fca0	代码优化	9 months ago
jun	2623fb0b66	排序发运优化	9 months ago
jun	1af2bdf866	装车单明细只校验单据是否存在	9 months ago
jun	527413f50a	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	673b50a95b	装车，发运逻辑调整	9 months ago
王杰	d2f06fdd99	发送设备加工参数	9 months ago
王杰	c8c7f5530c	读设备 日志重复问题修复； 扫描主条码 未知逻辑变更；读条码增加最大死循环次数后反馈到客户端再重试；	9 months ago
jun	4ea399b57b	发运单明细页面显示备注字段	9 months ago
jun	f63b8e650b	装车校验，是否记忆单据关闭	9 months ago
jun	df50abffc2	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	cffd69606d	PDA发运强过跳过问题修复	9 months ago
王杰	9ee803d5a1	读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题	9 months ago
微笑着面对明天	84d1dbc6a6	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
微笑着面对明天	821c4d7acc	未完成数量只在 匹配工单才更新	9 months ago
王杰	2001a6ab8a	工步: 进出零件验证逻辑调整 工位增加字段:是否不累加工单完成数量	9 months ago
jun	d57babb521	装车单校验和发运校验逻辑优化	9 months ago
jun	868783a04b	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	7db20fcf4b	AuthUtil修改为前端传参	9 months ago
王杰	583c90029d	mesmove 写入使用authutil 工步调用 报系统异常 临时写死系统 热部署	9 months ago
微笑着面对明天	2ac826e902	报工新增完成时间	9 months ago
微笑着面对明天	e897a1679e	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java	9 months ago
微笑着面对明天	c2c188cc36	报工新增完成时间	9 months ago
gsz	48e076f74d	mes_product_off_line description字段接mes_production_record的complete_date_time	9 months ago
jun	25236ecdae	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
jun	e30b5fcbb5	装车，发运强过，跳过功能开发	9 months ago
微笑着面对明天	324c2f0056	报工时间逻辑判断	9 months ago
微笑着面对明天	9188bee184	报工	9 months ago
微笑着面对明天	32bb68246a	Merge remote-tracking branch 'origin/dev' into dev	9 months ago
微笑着面对明天	e718f9542d	同步切面不修改修改时间，且工单修改时间用毫秒格式	9 months ago
王杰	9c9831aeeb	工位扫描 切换工单 立即生效	9 months ago
微笑着面对明天	78c8b3665e	同步切面不修改修改时间，且工单修改时间用毫秒格式	9 months ago
王杰	048f3d3ca3	提示信息优化	9 months ago
jun	a45903ffc7	批量报工，条码生成规则和批量打印功能保持一致	9 months ago
王杰	9f6517e90e	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	9 months ago
王杰	2626325527	装配件自制件	9 months ago
jun	971f967377	PDA产品加工记录查询,根据创建时间倒叙	9 months ago
jun	1ff40a34c4	PDA产品加工记录查询	9 months ago
王杰	23b8e9fc51	装配件匹配提示优化	9 months ago
王杰	cadf719f0a	工位扫描日志 增加策略	9 months ago
jun	fd2cf6d695	PDA产品加工记录查询&PCN报工功能调整	9 months ago
jun	6e3c460acb	NC处理批次不需要校验条码	9 months ago
王杰	86f040de3a	时效性验证	9 months ago
jun	a1b4eaee52	NC处理代码回退	9 months ago
jun	be0ad5eb80	NC处理返工单件不需要卡控条码	9 months ago
jun	8c11e1e852	打印模板增加打印时间字段	9 months ago
王杰	e67521446a	读胎膜切换信号工步	10 months ago
王杰	1df0d9bbac	装配件匹配策略 规则且唯一 注解不生效 问题解决	10 months ago
王杰	8df0968991	修改同步字段赋1的问题 已经跟罗 双 2人确认	10 months ago
王杰	d981d322e7	加工记录改成同零件条码物料最多汇报一次的问题出现的空指针问题	10 months ago
王杰	d350ce957e	主条码 可疑转正常 也支持扫描	10 months ago
王杰	167da1ff88	装配件条码 可疑转正常 也支持扫描	10 months ago
jun	64caf50651	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
王杰	0866a27027	查询加工记录表加工厂条件； 匹配加工规则 提示优化；增加配置允许其他工位的未知条码扫描的生产线配置；同零件条码同物料限制汇报一次	10 months ago
微笑着面对明天	62f7b28af9	报工问题修改	10 months ago
jun	a1295c948f	工位端-选择工单的页面，查询条件	10 months ago
jun	715f8be640	打印模板调整	10 months ago
jun	fb52cb2394	打印模板增加打印时间字段	10 months ago
微笑着面对明天	3b9b5e19cc	超工单验证log修改	10 months ago
gsz	500bd5017b	MesReportWorkByPreDayJob修改系统同步状态+产生新工单号前加"A-"标识自动	10 months ago
王杰	85bf50215e	设备发送加工参数	10 months ago
微笑着面对明天	395de65f82	报工问题修改	10 months ago
微笑着面对明天	0f64a2d303	报工问题修改	10 months ago
微笑着面对明天	e9eddebef5	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	df8cd11e67	报工问题修改	10 months ago
gsz	f16f4f630d	MesReportWorkByPreDayJob修改班次和计划时间	10 months ago
gsz	6afbfe9b5b	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
gsz	e64f5a8926	MesReportWorkByPreDayJob 班次从1/2 改为10/20	10 months ago
jun	bf2379204c	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	655f495f7b	问题清单修复	10 months ago
gsz	9ece60e019	MesReportWorkByPreDayJob报工状态增加40	10 months ago
王杰	0439e49640	系统配置查询方法	10 months ago
jun	98bdb40d14	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	fb6aa9048c	问题清单修复	10 months ago
微笑着面对明天	2013712397	报工问题修改	10 months ago
王杰	3c024dcb89	mes报表验证分表配置	10 months ago
王杰	29759184b6	mes报表验证分表配置	10 months ago
gsz	7c23cb83b4	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
gsz	2d1daf57bc	MesReportWorkByPreDayJob 班次时间变为时-分-秒	10 months ago
王杰	a18028a826	通用工位按钮 移动到核心包	10 months ago
王杰	f5904f4430	客户端下线 不再清除数据 变更成 上线时清除	10 months ago
jun	10f0c723a0	问题清单修复	10 months ago
jun	89709b9af7	问题清单修复	10 months ago
微笑着面对明天	663c011052	报工问题改成一次性报工多个	10 months ago
微笑着面对明天	f043086f1b	报工问题修改	10 months ago
微笑着面对明天	a688088130	返工替换条码	10 months ago
微笑着面对明天	5e3ed9b05b	报工问题修改	10 months ago
微笑着面对明天	a62b02478e	报工问题修改	10 months ago
微笑着面对明天	435b74b7ce	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	499b0112d9	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	6e89a4aa8a	问题清单修复	10 months ago
臧学普	489225cbe5	修复bug 42203,在有产出时，工单状态需要由已发布 变为加工中	10 months ago
jun	c0bcca2f51	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	bc05816202	问题清单修复	10 months ago
gsz	35017c2a65	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
gsz	fdbf3cdead	42194 PCN开关班管理界面，关班时记录一直更新到前一天的班次上，当前班次一直无法关班。	10 months ago
微笑着面对明天	b4bfbea463	配置xiugai	10 months ago
王杰	4c56202554	读设备工步 统一优化提示信息	10 months ago
jun	76def38674	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	38f85d1333	问题清单修复	10 months ago
王杰	2c57875b0c	工步打印 逻辑修改	10 months ago
微笑着面对明天	0f428020c4	报工问题修改	10 months ago
微笑着面对明天	48266f1bf0	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	2de392bac2	报工问题修改	10 months ago
王杰	97071d5c02	设备ID	10 months ago
微笑着面对明天	ba9cdcf798	报工问题修改	10 months ago
微笑着面对明天	0643590fbb	返工替换替换逻辑修改	10 months ago
微笑着面对明天	58157d9007	报工问题修改	10 months ago
微笑着面对明天	8dcb485117	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	f1f3a0d74b	报工问题修改	10 months ago
微笑着面对明天	183209b62a	报工问题修改	10 months ago
臧学普	0cc0ad93e7	打印模板不校验客户零件，规则校验移动到ruleNumber中的策略中	10 months ago
微笑着面对明天	b63e6c585c	报工问题修改	10 months ago
王杰	8f331b5a2a	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
王杰	ce2725926b	条码增加 已拆解 状态 工步对应修改	10 months ago
微笑着面对明天	b72ff0caf3	报工问题修改	10 months ago
王杰	5211abcb7b	条码生成工步 系统异常 提示优化	10 months ago
jun	575a2315fd	问题清单修复	10 months ago
臧学普	3e243a279f	添加工步打印策略查询numberRule规则	10 months ago
臧学普	801e2641cd	按照广州现场条码修改条码规则	10 months ago
臧学普	75d5a9bed7	按照广州现场条码修改条码规则	10 months ago
王杰	4cbd0558ee	status	10 months ago
jun	234fbc1efe	问题清单修复	10 months ago
微笑着面对明天	7952e1dd45	mqtt修改	10 months ago
王杰	b09b8828fa	加工异常工步 时间处理bug	10 months ago
微笑着面对明天	e33d535b9e	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	357655deb2	时间格式	10 months ago
王杰	d8e0e44a94	NC问题修复	10 months ago
微笑着面对明天	ea54c32c19	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
臧学普	96f9fc2b66	修改条码打印分隔符	10 months ago
微笑着面对明天	dc9ec29a6d	时间格式	10 months ago
jun	13293f0559	问题清单修复	10 months ago
jun	455d6dd547	问题修复	10 months ago
微笑着面对明天	a69aafb40d	清空加工数	10 months ago
微笑着面对明天	d8112fc96b	报工问题修改	10 months ago
jun	93fa082d2f	数据同步脚本	10 months ago
王杰	44d11aef0e	mesmove 增加 erp生产线值	10 months ago
臧学普	55027bac6b	工步打印条码修复	10 months ago
王杰	a817f7eb01	电子化检验 AB bug 生产零件条码 策略bug	10 months ago
王杰	8ea2581ab3	装车单 发运单 问题修改	10 months ago
臧学普	32c3626e6f	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
臧学普	0a4284cd0a	修复gqxnyPrintStrategy空指针问题	10 months ago
jun	a69b7d44d5	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	1ce33f14ab	问题清单修复	10 months ago
臧学普	ea346dc813	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
臧学普	f396cef18c	内部条码也需要添加简号	10 months ago
王杰	aa828063a7	编码策略： gqxnyNumberRuleStrategyService 修改 工步未传 客户零件对象	10 months ago
jun	58bd7e3c5a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	0f31bc01a5	问题清单修复	10 months ago
微笑着面对明天	c3e0967093	mqtt修改	10 months ago
jun	4c00b71b07	问题清单修复	10 months ago
jun	fd5dbfb7df	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	62a45210fd	问题清单修复	10 months ago
王杰	79c2082e9c	设备日志	10 months ago
王杰	15c5f12837	设备日志	10 months ago
微笑着面对明天	e998b14511	mqtt 数据	10 months ago
微笑着面对明天	41d8aae13f	报工问题修改	10 months ago
微笑着面对明天	dc35357c44	mqtt问题修改	10 months ago
王杰	bac8b77d5a	工步 提示信息 优化 去掉上下文字眼	10 months ago
jun	f83321a660	问题清单修复	10 months ago
王杰	e66cf87495	工步问题修复 工步调用工步 必须使用 executeInState方法	10 months ago
微笑着面对明天	38bddc5b4a	报工问题修改	10 months ago
微笑着面对明天	753f4be07d	报工问题修改	10 months ago
微笑着面对明天	3de67c0fbc	报工问题修改	10 months ago
微笑着面对明天	845628f5b7	报工问题修改	10 months ago
微笑着面对明天	f29a349df2	跨班次计数	10 months ago
jun	ee84f26953	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	14ee2898e9	代码错误	10 months ago
王杰	783395688f	加工异常	10 months ago
微笑着面对明天	6506c4626e	mqtt修改	10 months ago
jun	a4324b8f3a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	ba7985c238	bug 41915	10 months ago
微笑着面对明天	f5ab91c2d9	bug修改	10 months ago
微笑着面对明天	5307e78324	报工问题修改	10 months ago
微笑着面对明天	4e9dd5201c	mqtt修改	10 months ago
微笑着面对明天	77b8304de0	报工问题修改	10 months ago
王杰	d32640909e	设备加工 读点位 问题修复	10 months ago
jun	852525bfee	接口调试增加脚本，FID	10 months ago
王杰	45f53779b7	读设备工步 禁用扫描框、	10 months ago
王杰	9f589a2da7	头道模具号 没有找到加工规则 清除 头道数据	10 months ago
王杰	b9bbc4b006	装配件发送爆炸图 音频文件到客户端	10 months ago
王杰	869132254e	装配件发送爆炸图 音频文件到客户端	10 months ago
jun	9795b07de1	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java	10 months ago
jun	4832a34353	bug 41869	10 months ago
微笑着面对明天	486a7f9306	mqtt开发	10 months ago
王杰	11fcda0b43	顺序防错 bug	10 months ago
王杰	17a79cb7b2	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
王杰	984f9488d8	pcn step 代码优化	10 months ago
administrator	6452c062f6	Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
微笑着面对明天	4ef60c5324	业务履历修改	10 months ago
administrator	b9aca943d6	补录日志加工记录日志	10 months ago
微笑着面对明天	04b46181a7	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	963a373b9c	nc修改	10 months ago
jun	65c728ebc3	问题清单问题修复	10 months ago
jun	1ff7a8a720	问题清单问题修复	10 months ago
jun	b599d1b07a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	16c1607e6c	点检功能逻辑修改	10 months ago
微笑着面对明天	8fff60d726	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
微笑着面对明天	ac4924865d	job	10 months ago
王杰	0227927903	复用装配件 bug	10 months ago
jun	ed557c79ab	点检功能优化	10 months ago
jun	a598cafb7a	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	ebbb00950a	41819 点检主数据-新增&编辑-点检触发方式：删除 设备触发	10 months ago
王杰	cfea02b3b7	顺序防错	10 months ago
jun	79a5fbbb1e	41794 MES-PDA：点检-新增点检单问题汇总	10 months ago
微笑着面对明天	627217357c	报工问题修改	10 months ago
administrator	7d41ea50ac	判断加工结果需要判空	10 months ago
jun	fb6c3843fc	Merge remote-tracking branch 'origin/dev' into dev	10 months ago
jun	02ac595c82	41806 组件返工作业--返工单选择页面，增加一列“责任人”，从NC处理选择的责任人取值	10 months ago
administrator	268c842e48	Merge branch 'dev' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	10 months ago
administrator	3a13770bc7	工步重构打印	10 months ago
王杰	d97430d70f	重选工位	10 months ago
王杰	e4a5fce755	工艺防错	10 months ago
administrator	8f2d794472	工位打印重构	10 months ago
administrator	b6e806f40e	工位打印重构	10 months ago
administrator	bc571b6173	重构打印	11 months ago
王杰	6ab4f0f323	编码规则 增加 参数 dataMap	11 months ago
王杰	ed51c028ee	编码规则 增加 参数 dataMap	11 months ago
微笑着面对明天	dd177d2d75	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
微笑着面对明天	b53ab28e86	条码履历和加工单履历	11 months ago
王杰	5742015206	工位扫描 日志	11 months ago
王杰	74d5cb101b	条码生成工步	11 months ago
王杰	3ee38c6e7a	条码生成	11 months ago
王杰	f78108c702	装配件重置	11 months ago
王杰	292ece125c	按钮接口	11 months ago
administrator	6b9d3c4b53	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
王杰	13ff0c48b1	step	11 months ago
王杰	3a5b8f0568	倒计时	11 months ago
administrator	c5fa5f0127	补录日志--修改处理状态枚举	11 months ago
王杰	b431a1cf03	倒计时	11 months ago
微笑着面对明天	e1f5ed5610	规则策略	11 months ago
微笑着面对明天	22560a0a8b	报工问题修改	11 months ago
微笑着面对明天	d9d7931a91	报工问题修改	11 months ago
微笑着面对明天	6fc77688be	报工问题修改	11 months ago
王杰	7439a515cd	fsm reset	11 months ago
jun	fc046df6b4	排序发运校验问题修复	11 months ago
jun	8facc242b9	Merge remote-tracking branch 'origin/dev' into dev	11 months ago
jun	33ffd51602	41757 MES:PDA：点检进入报错＆点检无法下拉，无法点击完成点检	11 months ago