1061 Commits (ad2a7f8722337db227025f1b771ca63ca6500062)

Author	SHA1	Message	Date
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
王杰	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
jun	43ba2569c1	非排序拆解功能	8 months ago
王杰	8e321c50ff	wuhan 工单 工步	8 months ago
xiangwei.zhang	25b01eb43c	判断可疑	8 months ago
xiangwei.zhang	17cc0df013	判断可疑	8 months ago
gsz	1ae2f9a3f2	42925 原材料防错优化	8 months ago
gsz	7fd1e0aa7a	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	8 months ago
gsz	6179c4b4b1	电子化检验 质量状态发生变化后，同步标识改为未同步	8 months ago
jun	2d7e14e916	原材料防错，提交逻辑优化(代码回退)	8 months ago
jun	463a365660	非排序 返工拆解流程开发	8 months ago
jun	e8395e2062	非排序 返工拆解流程开发	8 months ago
jun	8dc523d83d	PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号）	8 months ago
jun	9b7c9e4bb2	原材料防错，提交逻辑优化	8 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	读胎膜切换信号工步	9 months ago
王杰	1df0d9bbac	装配件匹配策略 规则且唯一 注解不生效 问题解决	9 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