1219 Commits (b118f22767bc27a1ad79d1a42ad5a93aab5059c0)

 

All Branches   

Search

Author	SHA1	Message	Date
王杰	b118f22767	Merge branch 'master' into dev-wuhan-temp	7 months ago
王杰	5ab9d9098b	工艺参数完成 动态sql写入	7 months ago
王杰	8cce62b47d	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	fbf1bfce20	装配件排序	7 months ago
王杰	441d28d2e1	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	27086124ae	装配件工步调整	7 months ago
王杰	b32bef4d09	装配件整腔跳过ug	7 months ago
王杰	2d8901489d	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	8cafc24d35	装配件整腔跳过	7 months ago
王杰	d4102a5fcf	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	5f604adc9d	显示前道所有装配件	7 months ago
gsz	f3b4e08a10	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	7 months ago
gsz	4a72b849e9	JIS拉动组规则校验	7 months ago
jun	b741c1deb5	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
jun	1a4c94f88a	getById方法增加organizeCode条件	7 months ago
王杰	c419399787	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	860b4d9c49	Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan	7 months ago
王杰	53ba608c16	打印	7 months ago
yxw	265f4ef7dc	排序展示组件 展示工单序号	7 months ago
王杰	ab8cb55e4a	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	84436a5b0f	修复产品加工记录 数据覆盖 没有新增的问题	7 months ago
王杰	fdf8c283e8	设备日志明细分表	7 months ago
jun	c0feb1dde4	排序发运逻辑调整	7 months ago
臧学普	c45b5724f6	暂时注释掉webservice	7 months ago
臧学普	f3e2254e45	电测试开发	7 months ago
臧学普	14817b8d61	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan ... # Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesCustomerSnTransformService.java # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java	7 months ago
王杰	0bdce60c37	Merge branch 'master' into dev-wuhan-temp	7 months ago
王杰	2ef09dee56	mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表	7 months ago
gsz	630ac61e31	SPS打印增加打印时间	7 months ago
jun	94c320d2cb	排序发运逻辑调整	7 months ago
yxw	31072fac39	排序展示组件报错	7 months ago
臧学普	ad2a7f8722	电测试开发	7 months ago
yxw	8252c90f03	裁片原材料防错	7 months ago
jun	082e83a94a	排序发运逻辑调整	7 months ago
王杰	838d1f82db	merge dev 冲突解决	7 months ago
王杰	8930187f6f	代码优化	7 months ago
王杰	23b774af3a	工单修改工步 修改方式变更	7 months ago
王杰	893f307284	工单修改工步， 修改方式调整	7 months ago
jun	4d9d03725b	Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan	7 months ago
jun	24d2cd89e6	非排序报工功能开发（代码调整）	7 months ago
jun	d708e96d46	非排序报工功能开发	7 months ago
xiangwei.zhang	7343c0e462	判断可疑	7 months ago
王杰	80677847b1	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	3a81d887a5	前道防错工步	7 months ago
gsz	3b955236e6	43302 加料防错扫码流程优化	7 months ago
王杰	1a734d52d0	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	315009b22c	合并dev	7 months ago
王杰	0f88c13f3b	Merge branch 'dev-wuhan' into dev-wuhan-temp	7 months ago
王杰	e20e160034	合并dev	7 months ago
王杰	24fd34c088	合并dev	7 months ago