965 Commits (a78238b49c658d190dc8ec1708eb71d5d19bf9e6)

Author	SHA1	Message	Date
王杰	2af9d8f125	工步弹框	1 year ago
jun	59c44cb199	发运单，装车单跳过逻辑调整	1 year ago
jun	17a2254f3a	站点信息基础数据	1 year ago
jun	e22af55524	装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS	1 year ago
jun	bf49601ad1	扫描可回用包装开发	1 year ago
yxw	47dee04a69	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	ae725102b7	保存裁片加工记录	1 year ago
jun	d883d077fd	料包绑定增加外协件逻辑	1 year ago
王杰	59fc125885	通用顺序防错工步	1 year ago
jun	0cd56db811	返工代码优化	1 year ago
jun	91ff86f2d3	返工完成方法名事务问题修改	1 year ago
yxw	428e0bdce6	修改原材料长度	1 year ago
jun	a63247efc8	返工拆解inspection表里，nc_status增加拆解功能	1 year ago
jun	8a08eaaf53	发运单中默认不写装车单信息，需要反查	1 year ago
jun	fd46d3ab15	发运跳过逻辑优化	1 year ago
yxw	54bc6daf7f	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	add6da8105	修复原材料防错记录修改长度履历时修改类型不对问题	1 year ago
王杰	1cfe0f53c0	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	959eb9aa11	设备计数验证shotCounter	1 year ago
yxw	b3c75bb50a	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	1e8f6672cf	裁片功能	1 year ago
jun	05d89d34bb	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
jun	2ef4f1e2f0	料包绑定功能开发	1 year ago
yxw	df3f552348	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	f6e0ae2118	裁片原材料防错增加长度修改记录	1 year ago
王杰	5cf100bce8	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	1 year ago
王杰	c2b94c2ad6	生成零件号 可复用	1 year ago
王杰	b2325f6ce0	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	1 year ago
王杰	8d704d6a9e	排序顺序防错	1 year ago
yxw	65b902f4ba	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	82db0d1594	10.193.30.22 服务器配置文件	1 year ago
jun	b98c50a6e8	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	408911ff1b	返工拆解，查询树形装配件，增加id,pid关联	1 year ago
王杰	3cf7ef6096	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	8789532066	PcnRepositoryAspect	1 year ago
jun	d76ad89328	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	3a5e4d844e	重新检测生成单据，同步标识重置	1 year ago
gsz	58811fff06	42984 初检创建时修改人和修改时间不能赋值	1 year ago
yxw	78514c8beb	Merge remote-tracking branch 'origin/dev' into dev-wuhan	1 year ago
yxw	2a6bcfc4dc	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	487c627bf8	裁片工单生成问题修复	1 year ago
jun	adfcb960c9	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	a4a612bd9c	点检单同步标识未修改	1 year ago
王杰	f894210e6f	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	0c88633bfa	删除无用的备份工步	1 year ago
王杰	90e6ff708d	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	1 year ago
王杰	ba80057ac8	读设备数据 写日志 增加	1 year ago
jun	05ccf6501f	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	b731d10d44	电子化检验拆解功能开发	1 year ago
yxw	bcf15b1eaa	修改原材料修改记录表	1 year ago
王杰	a2c80f138d	代码写错	1 year ago
王杰	f9a1e5322e	Merge branch 'dev' into dev-wuhan	1 year ago
王杰	27b40d6709	设备查询点位数据去除事务	1 year ago
jun	bc60e1a2c1	电子化检验拆解功能开发	1 year ago
yxw	9f6afe14fd	解决代码冲突	1 year ago
yxw	92f9a79e97	PCN长度修改类型获取接口	1 year 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	1 year 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	1 year ago
jun	5a6b1f1d2a	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
yxw	9b018ceb28	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	1 year ago
yxw	a8db4e761c	裁片原材料防错	1 year ago
jun	43ba2569c1	非排序拆解功能	1 year ago
王杰	8e321c50ff	wuhan 工单 工步	1 year ago
xiangwei.zhang	25b01eb43c	判断可疑	1 year ago
xiangwei.zhang	17cc0df013	判断可疑	1 year ago
gsz	1ae2f9a3f2	42925 原材料防错优化	1 year ago
gsz	7fd1e0aa7a	Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev	1 year ago
gsz	6179c4b4b1	电子化检验 质量状态发生变化后，同步标识改为未同步	1 year ago
jun	2d7e14e916	原材料防错，提交逻辑优化(代码回退)	1 year ago
jun	463a365660	非排序 返工拆解流程开发	1 year ago
jun	e8395e2062	非排序 返工拆解流程开发	1 year ago
jun	8dc523d83d	PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号）	1 year ago
jun	9b7c9e4bb2	原材料防错，提交逻辑优化	1 year ago
jun	c927a4f9e0	发运单中装车单字段赋值	1 year ago
jun	3d7358c134	设备点检，点检类型：设备点检、工艺参数点检，点击开始点检后，需要强制扫描/输入设备ID	1 year ago
jun	045414d98d	点检功能，工艺参数点检，目前无法完整使用该功能。	1 year ago
王杰	c71f0e983a	工序用量, 不显示且不扫描, 规则且唯一单独表记录	1 year ago
jun	4e61e55de5	汇总工单发送SAP逻辑调整	1 year ago
王杰	48d268e2e1	发送设备加工参数, 物料取值变更	1 year ago
王杰	cb2f68baf8	扫描装配件工步 魔鬼数字 改枚举	1 year ago
gsz	5245e00ca9	工位参数按钮事件接口实现【设备停机】FUNCTION_EQU_DOWNTIME	1 year ago
王杰	5f6a79b122	71 239 配置文件	1 year ago
王杰	9d91db16b3	工步操作redis 方法去动词； 读加工结果 增加shot	1 year ago
jun	96924514fb	装配件替换，提示信息优化	1 year ago
jun	603123568f	返工，装配件替换问题修复	1 year ago
gsz	53b5928add	报工job修改	1 year ago
jun	59f9023c23	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	8361a745e6	42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 ... 42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描	1 year ago
gsz	d2ef4c8a4a	newMesProductOffLine赋值修改SapWorkCenter--祥卫	1 year ago
jun	697d0933ae	PDA产品加工记录查询，查询速度优化	1 year ago
jun	5dc8837436	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	dac6b80993	生产版本和工作中心绑定关系取消	1 year ago
王杰	9147f38645	读设备工步 优化提示	1 year ago
王杰	c37cd5ee60	新增场景：扫主 扫装 生成零件号	1 year ago
王杰	95827228de	扫描装配件2 生成零件号2 新增场景:扫主存在多个加工规则场景的解决方案	1 year ago
jun	fa3772b9d0	Merge remote-tracking branch 'origin/dev' into dev	1 year ago
jun	5cb72f5c38	接口映射，自定义脚本页面开发	1 year ago
gsz	95b689b2a1	创建的工单号写到设备加工记录表--唐08-22变更	1 year ago
jun	573d95cbd6	返工打印新条码记录	1 year ago
jun	1ebecd579f	Merge remote-tracking branch 'origin/dev' into dev	1 year ago