1077 Commits (949da88cea8d6d8730961a01844fde96ec1b8efa)

 

All Branches   

Search

Author	SHA1	Message	Date
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	d818cb08d7	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	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	判断可疑	8 months ago
xiangwei.zhang	17cc0df013	判断可疑	8 months ago
gsz	1ae2f9a3f2	42925 原材料防错优化	8 months ago
yxw	38c4fa0907	裁片功能主数据表	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