937 Commits (17a2254f3a3c9d8086a1b25f3888edcbd7663ab5)

Author	SHA1	Message	Date
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